提交 d36ccdbd 编写于 作者: L Linus Torvalds

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
...@@ -2706,10 +2706,11 @@ F: fs/ceph/ ...@@ -2706,10 +2706,11 @@ F: fs/ceph/
CERTIFICATE HANDLING: CERTIFICATE HANDLING:
M: David Howells <dhowells@redhat.com> M: David Howells <dhowells@redhat.com>
M: David Woodhouse <dwmw2@infradead.org> M: David Woodhouse <dwmw2@infradead.org>
L: keyrings@linux-nfs.org L: keyrings@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/module-signing.txt F: Documentation/module-signing.txt
F: certs/ F: certs/
F: scripts/sign-file.c
F: scripts/extract-cert.c F: scripts/extract-cert.c
CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM: CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
......
...@@ -794,6 +794,7 @@ long join_session_keyring(const char *name) ...@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
ret = PTR_ERR(keyring); ret = PTR_ERR(keyring);
goto error2; goto error2;
} else if (keyring == new->session_keyring) { } else if (keyring == new->session_keyring) {
key_put(keyring);
ret = 0; ret = 0;
goto error2; goto error2;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册