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

Commit 4fe4763c authored by Jay Vosburgh's avatar Jay Vosburgh Committed by David S. Miller
Browse files

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@amorsen.dk>.

Signed-off-by: default avatarJay Vosburgh <fubar@us.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80ee5ad2

drivers/net/bonding/bond_main.c

+9 −7
Original line number Diff line number Diff line
@@ -4896,6 +4896,7 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond 
	down_write(&bonding_rwsem);



	/* Check to see if the bond already exists. */

	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
@@ -4904,6 +4905,7 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond 
				res = -EPERM;

				goto out_rtnl;

			}

	}



	bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",

				ether_setup);