diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-20 03:02:31 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-20 03:02:31 +0300 |
| commit | d36ccdbd1ca1050ad4e7b9b16ced848132533f6e (patch) | |
| tree | f38e51acca6410a38fd89261e6c6de88803cc105 | |
| parent | 7c24d9f3b27b198c3c4dfc8327a25fb077a96219 (diff) | |
| parent | 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 (diff) | |
| download | linux-d36ccdbd1ca1050ad4e7b9b16ced848132533f6e.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem update from James Morris:
"A CVE fix and a maintainers file update"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: Fix keyring ref leak in join_session_keyring()
Fix the MAINTAINERS record for the certs/ directory
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | security/keys/process_keys.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 95eafcc2bc85..3b45a1bdb62e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2706,10 +2706,11 @@ F: fs/ceph/ CERTIFICATE HANDLING: M: David Howells <dhowells@redhat.com> M: David Woodhouse <dwmw2@infradead.org> -L: keyrings@linux-nfs.org +L: keyrings@vger.kernel.org S: Maintained F: Documentation/module-signing.txt F: certs/ +F: scripts/sign-file.c F: scripts/extract-cert.c CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM: diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index a3f85d2a00bb..e6d50172872f 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c @@ -794,6 +794,7 @@ long join_session_keyring(const char *name) ret = PTR_ERR(keyring); goto error2; } else if (keyring == new->session_keyring) { + key_put(keyring); ret = 0; goto error2; } |