[linux] 01/03: KEYS: Fix race between key destruction and finding a keyring by name

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

carnil pushed a commit to branch jessie-security
in repository linux.

commit 1d67f1eb3c54272523dd04ffdeac0a513febda84
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Tue Oct 20 19:13:53 2015 +0200

    KEYS: Fix race between key destruction and finding a keyring by name
---
 debian/changelog                                   |  6 +++
 ...ce-between-key-destruction-and-finding-a-.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 59 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4dfebdb..921eb5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux (3.16.7-ckt11-1+deb8u6) UNRELEASED; urgency=medium
+
+  * KEYS: Fix race between key destruction and finding a keyring by name
+
+ -- Salvatore Bonaccorso <carnil at debian.org>  Tue, 20 Oct 2015 19:12:50 +0200
+
 linux (3.16.7-ckt11-1+deb8u5) jessie-security; urgency=medium
 
   [ Ben Hutchings ]
diff --git a/debian/patches/bugfix/all/KEYS-Fix-race-between-key-destruction-and-finding-a-.patch b/debian/patches/bugfix/all/KEYS-Fix-race-between-key-destruction-and-finding-a-.patch
new file mode 100644
index 0000000..3e779c3
--- /dev/null
+++ b/debian/patches/bugfix/all/KEYS-Fix-race-between-key-destruction-and-finding-a-.patch
@@ -0,0 +1,52 @@
+From: David Howells <dhowells at redhat.com>
+Date: Fri, 25 Sep 2015 16:30:08 +0100
+Subject: KEYS: Fix race between key destruction and finding a keyring by name
+Origin: https://git.kernel.org/linus/94c4554ba07adbdde396748ee7ae01e86cf2d8d7
+
+There appears to be a race between:
+
+ (1) key_gc_unused_keys() which frees key->security and then calls
+     keyring_destroy() to unlink the name from the name list
+
+ (2) find_keyring_by_name() which calls key_permission(), thus accessing
+     key->security, on a key before checking to see whether the key usage is 0
+     (ie. the key is dead and might be cleaned up).
+
+Fix this by calling ->destroy() before cleaning up the core key data -
+including key->security.
+
+Reported-by: Petr Matousek <pmatouse at redhat.com>
+Signed-off-by: David Howells <dhowells at redhat.com>
+---
+ security/keys/gc.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/security/keys/gc.c b/security/keys/gc.c
+index c795237..39eac1f 100644
+--- a/security/keys/gc.c
++++ b/security/keys/gc.c
+@@ -134,6 +134,10 @@ static noinline void key_gc_unused_keys(struct list_head *keys)
+ 		kdebug("- %u", key->serial);
+ 		key_check(key);
+ 
++		/* Throw away the key data */
++		if (key->type->destroy)
++			key->type->destroy(key);
++
+ 		security_key_free(key);
+ 
+ 		/* deal with the user's key tracking and quota */
+@@ -148,10 +152,6 @@ static noinline void key_gc_unused_keys(struct list_head *keys)
+ 		if (test_bit(KEY_FLAG_INSTANTIATED, &key->flags))
+ 			atomic_dec(&key->user->nikeys);
+ 
+-		/* now throw away the key memory */
+-		if (key->type->destroy)
+-			key->type->destroy(key);
+-
+ 		key_user_put(key->user);
+ 
+ 		kfree(key->description);
+-- 
+2.6.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e7529f0..4565283 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -652,3 +652,4 @@ bugfix/all/usb-whiteheat-fix-potential-null-deref-at-probe.patch
 bugfix/all/sctp-fix-race-on-protocol-netns-initialization.patch
 bugfix/all/ipc-sem.c-fully-initialize-sem_array-before-making-i.patch
 bugfix/all/Initialize-msg-shm-IPC-objects-before-doing-ipc_addid.patch
+bugfix/all/KEYS-Fix-race-between-key-destruction-and-finding-a-.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git