Commit 35d96e63 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

bonding: init notify_work earlier to avoid uninitialized use 



If bond_kobj_init() or later kzalloc() in bond_alloc_slave() fail,
then we call kobject_put() on the slave->kobj. This in turn calls
the release function slave_kobj_release() which will always try to
cancel_delayed_work_sync(&slave->notify_work), which shouldn't be
done on an uninitialized work struct.

Always initialize the work struct earlier to avoid problems here.

Syzbot bisected this down to a completely pointless commit, some
fault injection may have been at work here that caused the alloc
failure in the first place, which may interact badly with bisect.

Reported-by: default avatar <syzbot+bfda097c12a00c8cae67@syzkaller.appspotmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-by: default avatarJay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3c814519

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1526,6 +1526,7 @@ static struct slave *bond_alloc_slave(struct bonding *bond, 


	slave->bond = bond;

	slave->dev = slave_dev;

	INIT_DELAYED_WORK(&slave->notify_work, bond_netdev_notify_work);



	if (bond_kobj_init(slave))

		return NULL;
@@ -1538,7 +1539,6 @@ static struct slave *bond_alloc_slave(struct bonding *bond, 
			return NULL;

		}

	}

	INIT_DELAYED_WORK(&slave->notify_work, bond_netdev_notify_work);



	return slave;

}