]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Oct 2013 06:32:01 +0000 (07:32 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Oct 2013 06:32:01 +0000 (07:32 +0100)
commit88829dfe4b6ea0c1c24d415668b3bfa78e5a5b16
tree81b99b02f96d81b4a62b0f7a24e53fdae673bf75
parente6036c0b88962df82a8853971b86a55f09faef40
parent43b7c6c6a4e3916edd186ceb61be0c67d1e0969e
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