Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d36ccdbd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7c24d9f3 23567fd0

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -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:

security/keys/process_keys.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

	}