projects/linux·commit d36ccdbd

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

d36ccdbd · Linus Torvalds <[email protected]> · 2016-01-19 16:02:31 -08:00

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
Commit
d36ccdbd1ca1050ad4e7b9b16ced848132533f6e
Parents
7c24d9f3 · 23567fd0

Merge commit. Changes below are compared with the first parent: 7c24d9f3.

Changes

2 files changed · +3 −1

FileStatusAddDelContent
MAINTAINERSmodified+2−1View file
security/keys/process_keys.cmodified+1−0View file

MAINTAINERS

View file
diff --git a/MAINTAINERS b/MAINTAINERS
index 95eafcc..3b45a1b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2706,10 +2706,11 @@ F: fs/ceph/
CERTIFICATE HANDLING:
M: David Howells <[email protected]>
M: David Woodhouse <[email protected]>
-L: [email protected]
+L: [email protected]
S: Maintained
F: Documentation/module-signing.txt
F: certs/
+F: scripts/sign-file.c
F: scripts/extract-cert.c
CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:

security/keys/process_keys.c

View file
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index a3f85d2..e6d5017 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;
}