Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+3 -1
+2 -1
MAINTAINERS
··· 2706 2706 CERTIFICATE HANDLING: 2707 2707 M: David Howells <dhowells@redhat.com> 2708 2708 M: David Woodhouse <dwmw2@infradead.org> 2709 - L: keyrings@linux-nfs.org 2709 + L: keyrings@vger.kernel.org 2710 2710 S: Maintained 2711 2711 F: Documentation/module-signing.txt 2712 2712 F: certs/ 2713 + F: scripts/sign-file.c 2713 2714 F: scripts/extract-cert.c 2714 2715 2715 2716 CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
+1
security/keys/process_keys.c
··· 794 794 ret = PTR_ERR(keyring); 795 795 goto error2; 796 796 } else if (keyring == new->session_keyring) { 797 + key_put(keyring); 797 798 ret = 0; 798 799 goto error2; 799 800 }