diff options
| author | Linus Torvalds | 2012-08-02 19:57:31 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-08-02 19:57:31 +0200 |
| commit | c8924234bd9c06fe86bae648c472d56cb10640a5 (patch) | |
| tree | b7ecba9e5fd1f7c451f00fc52a98c321153cc522 /fs/jfs/jfs_acl.h | |
| parent | Merge tag 'ecryptfs-3.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | libceph: fix crypto key null deref, memory leak (diff) | |
| download | kernel-qcow2-linux-c8924234bd9c06fe86bae648c472d56cb10640a5.tar.gz kernel-qcow2-linux-c8924234bd9c06fe86bae648c472d56cb10640a5.tar.xz kernel-qcow2-linux-c8924234bd9c06fe86bae648c472d56cb10640a5.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull two ceph fixes from Sage Weil:
"The first patch fixes up the old crufty open intent code to use the
atomic_open stuff properly, and the second fixes a possible null deref
and memory leak with the crypto keys."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: fix crypto key null deref, memory leak
ceph: simplify+fix atomic_open
Diffstat (limited to 'fs/jfs/jfs_acl.h')
0 files changed, 0 insertions, 0 deletions