mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 22:54:01 +00:00
bonding: init notify_work earlier to avoid uninitialized use
[ Upstream commit 35d96e6318
]
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: syzbot+bfda097c12a00c8cae67@syzkaller.appspotmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
a0a37e4454
commit
1fb72dd4bc
1 changed files with 1 additions and 1 deletions
|
@ -1295,6 +1295,7 @@ static struct slave *bond_alloc_slave(struct bonding *bond,
|
||||||
|
|
||||||
slave->bond = bond;
|
slave->bond = bond;
|
||||||
slave->dev = slave_dev;
|
slave->dev = slave_dev;
|
||||||
|
INIT_DELAYED_WORK(&slave->notify_work, bond_netdev_notify_work);
|
||||||
|
|
||||||
if (bond_kobj_init(slave))
|
if (bond_kobj_init(slave))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -1307,7 +1308,6 @@ static struct slave *bond_alloc_slave(struct bonding *bond,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
INIT_DELAYED_WORK(&slave->notify_work, bond_netdev_notify_work);
|
|
||||||
|
|
||||||
return slave;
|
return slave;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue