rpms/kernel/devel linux-2.6-netdev-bonding-fix-null-deref.patch, NONE, 1.1 kernel.spec, 1.395, 1.396

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11573

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-netdev-bonding-fix-null-deref.patch 
Log Message:
* Thu Jan 31 2008 Chuck Ebbert <cebbert at redhat.com>
- Fix null pointer dereference in bonding driver (#430391)


linux-2.6-netdev-bonding-fix-null-deref.patch:

--- NEW FILE linux-2.6-netdev-bonding-fix-null-deref.patch ---
From: Jay Vosburgh <fubar at us.ibm.com>
Date: Wed, 30 Jan 2008 02:07:45 +0000 (-0800)
Subject: bonding: fix NULL pointer deref in startup processing
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjgarzik%2Fnetdev-2.6.git;a=commitdiff_plain;h=5eb71eec3616b0a62e63197016576a74da240c6b

bonding: fix NULL pointer deref in startup processing

	Fix the "are we creating a duplicate" check to not compare
the name if the name is NULL (meaning that the system should select
a name).  Bug reported by Benny Amorsen <benny+usenet at amorsen.dk>.

Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
---

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 65c7eba..81b4574 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4896,14 +4896,16 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
 	down_write(&bonding_rwsem);
 
 	/* Check to see if the bond already exists. */
-	list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
-		if (strnicmp(bond->dev->name, name, IFNAMSIZ) == 0) {
-			printk(KERN_ERR DRV_NAME
+	if (name) {
+		list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
+			if (strnicmp(bond->dev->name, name, IFNAMSIZ) == 0) {
+				printk(KERN_ERR DRV_NAME
 			       ": cannot add bond %s; it already exists\n",
-			       name);
-			res = -EPERM;
-			goto out_rtnl;
-		}
+				       name);
+				res = -EPERM;
+				goto out_rtnl;
+			}
+	}
 
 	bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
 				ether_setup);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- kernel.spec	30 Jan 2008 15:01:04 -0000	1.395
+++ kernel.spec	31 Jan 2008 22:46:28 -0000	1.396
@@ -647,6 +647,9 @@
 Patch2000: linux-2.6-e1000-corrupt-eeprom-checksum.patch
 Patch2001: linux-2.6-netdev-e1000-disable-alpm.patch
 
+# fix null pointer deref in bonding driver
+Patch2010: linux-2.6-netdev-bonding-fix-null-deref.patch
+
 # ext4dev upstream patch queue, slated for 2.6.25
 # "stable" patches as of 1/21/2008
 # supporting files, and ext4/jbd2 core files
@@ -1175,6 +1178,7 @@
 
 ApplyPatch linux-2.6-e1000-corrupt-eeprom-checksum.patch
 ApplyPatch linux-2.6-netdev-e1000-disable-alpm.patch
+ApplyPatch linux-2.6-netdev-bonding-fix-null-deref.patch
 
 # drm-mm catchup (modesetting, ...)
 ApplyPatch linux-2.6-agp-mm.patch
@@ -1776,6 +1780,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Thu Jan 31 2008 Chuck Ebbert <cebbert at redhat.com>
+- Fix null pointer dereference in bonding driver (#430391)
+
 * Wed Jan 30 2008 Eric Sandeen <sandeen at redhat.com>
 - Allow xattrs in body of root ext4 inode (#429857)
   Should fix selinux installs.