| commit | 88829dfe4b6ea0c1c24d415668b3bfa78e5a5b16 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 25 07:32:01 2013 +0100 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 25 07:32:01 2013 +0100 |
| tree | 81b99b02f96d81b4a62b0f7a24e53fdae673bf75 | |
| parent | e6036c0b88962df82a8853971b86a55f09faef40 [diff] | |
| parent | 43b7c6c6a4e3916edd186ceb61be0c67d1e0969e [diff] |
Merge tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
Pull ecryptfs fixes from Tyler Hicks:
"Two important fixes
- Fix long standing memory leak in the (rarely used) public key
support
- Fix large file corruption on 32 bit architectures"
* tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
eCryptfs: fix 32 bit corruption issue
ecryptfs: Fix memory leakage in keystore.c