rpms/kernel/FC-4 linux-2.6.13-key-keyring-destroy.patch, NONE, 1.1 kernel-2.6.spec, 1.1421, 1.1422

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Aug 11 22:52:38 UTC 2005


Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv19716

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6.13-key-keyring-destroy.patch 
Log Message:
Fix keyring destroy security hole.



linux-2.6.13-key-keyring-destroy.patch:
 keyring.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6.13-key-keyring-destroy.patch ---
--- linux-2.6.9/security/keys/keyring.c.orig	2005-07-28 16:32:16.445246716 +0100
+++ linux-2.6.9/security/keys/keyring.c	2005-07-28 16:32:56.000000000 +0100
@@ -201,7 +201,11 @@ static void keyring_destroy(struct key *
 
 	if (keyring->description) {
 		write_lock(&keyring_name_lock);
-		list_del(&keyring->type_data.link);
+
+		if (keyring->type_data.link.next != NULL &&
+		    !list_empty(&keyring->type_data.link))
+			list_del(&keyring->type_data.link);
+
 		write_unlock(&keyring_name_lock);
 	}
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1421
retrieving revision 1.1422
diff -u -r1.1421 -r1.1422
--- kernel-2.6.spec	11 Aug 2005 22:50:55 -0000	1.1421
+++ kernel-2.6.spec	11 Aug 2005 22:52:36 -0000	1.1422
@@ -368,6 +368,9 @@
 Patch3021: linux-2.6.9-ipw2200.patch
 Patch3022: linux-2.6.9-ieee80211.patch
 
+# Security fixes.
+Patch4000: linux-2.6.13-key-keyring-destroy.patch
+
 #
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here. 
@@ -840,6 +843,9 @@
 %patch3021 -p1
 %patch3022 -p1
 
+# Security fixes.
+%patch4000 -p1
+
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream




More information about the fedora-cvs-commits mailing list