[kernel] r6394 - in dists/sid/linux-2.6/debian: . patches patches/series

[Frederik Schüler]

Author: fs
Date: Tue Apr 11 16:14:17 2006
New Revision: 6394

Added:
   dists/sid/linux-2.6/debian/patches/2.6.16.3
   dists/sid/linux-2.6/debian/patches/series/7
Modified:
   dists/sid/linux-2.6/debian/changelog
Log:
Start 2.6.16-7.
Add 2.6.16.3.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Apr 11 16:14:17 2006
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.16-7) UNRELEASED; urgency=low
+
+  [ Frederik Schüler ]
+  * Add stable release 2.6.16.3:
+    - Keys: Fix oops when adding key to non-keyring [CVE-2006-1522]
+
+ -- Frederik Schüler <fs at debian.org>  Tue, 11 Apr 2006 17:42:51 +0200
+
 linux-2.6 (2.6.16-6) unstable; urgency=medium
 
   [ Bastian Blank ]

Added: dists/sid/linux-2.6/debian/patches/2.6.16.3
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/2.6.16.3	Tue Apr 11 16:14:17 2006
@@ -0,0 +1,27 @@
+diff --git a/security/keys/key.c b/security/keys/key.c
+index 99781b7..0e2584e 100644
+--- a/security/keys/key.c
++++ b/security/keys/key.c
+@@ -785,6 +785,10 @@ key_ref_t key_create_or_update(key_ref_t
+ 
+ 	key_check(keyring);
+ 
++	key_ref = ERR_PTR(-ENOTDIR);
++	if (keyring->type != &key_type_keyring)
++		goto error_2;
++
+ 	down_write(&keyring->sem);
+ 
+ 	/* if we're going to allocate a new key, we're going to have
+diff --git a/security/keys/keyring.c b/security/keys/keyring.c
+index d65a180..bffa924 100644
+--- a/security/keys/keyring.c
++++ b/security/keys/keyring.c
+@@ -437,6 +437,7 @@ EXPORT_SYMBOL(keyring_search);
+ /*
+  * search the given keyring only (no recursion)
+  * - keyring must be locked by caller
++ * - caller must guarantee that the keyring is a keyring
+  */
+ key_ref_t __keyring_search_one(key_ref_t keyring_ref,
+ 			       const struct key_type *ktype,

Added: dists/sid/linux-2.6/debian/patches/series/7
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/series/7	Tue Apr 11 16:14:17 2006
@@ -0,0 +1 @@
++ 2.6.16.3