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

Commit 6c9261a2 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

net: bonding: correctly annotate RCU in bond_should_notify_peers() 



[ Upstream commit 3ba359c0cd6eb5ea772125a7aededb4a2d516684 ]

RCU use in bond_should_notify_peers() looks wrong, since it does
rcu_dereference(), leaves the critical section, and uses the
pointer after that.

Luckily, it's called either inside a nested RCU critical section
or with the RTNL held.

Annotate it with rcu_dereference_rtnl() instead, and remove the
inner RCU critical section.

Fixes: 4cb4f97b ("bonding: rebuild the lock use for bond_mii_monitor()")
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-by: default avatarJay Vosburgh <jv@jvosburgh.net>
Link: https://patch.msgid.link/20240719094119.35c62455087d.I68eb9c0f02545b364b79a59f2110f2cf5682a8e2@changeid


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5c65e55e

drivers/net/bonding/bond_main.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -774,13 +774,10 @@ static struct slave *bond_find_best_slave(struct bonding *bond) 
	return bestslave;

	return bestslave;

}

}





/* must be called in RCU critical section or with RTNL held */

static bool bond_should_notify_peers(struct bonding *bond)

static bool bond_should_notify_peers(struct bonding *bond)

{

{

	struct slave *slave;

	struct slave *slave = rcu_dereference_rtnl(bond->curr_active_slave);



	rcu_read_lock();

	slave = rcu_dereference(bond->curr_active_slave);

	rcu_read_unlock();





	if (!slave || !bond->send_peer_notif ||

	if (!slave || !bond->send_peer_notif ||

	    !netif_carrier_ok(bond->dev) ||

	    !netif_carrier_ok(bond->dev) ||