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

Commit 17120889 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[BRIDGE]: sysfs locking fix. 



The stp change code generates "sleeping function called from invalid
context" because rtnl_lock() called with BH disabled. This fixes it by
not acquiring then dropping the bridge lock.

Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45241a7a

net/bridge/br_sysfs_br.c

+15 −9
Original line number Diff line number Diff line
@@ -147,20 +147,26 @@ static ssize_t show_stp_state(struct device *d, 
	return sprintf(buf, "%d\n", br->stp_enabled);

}



static void set_stp_state(struct net_bridge *br, unsigned long val)

{

	rtnl_lock();

	spin_unlock_bh(&br->lock);

	br_stp_set_enabled(br, val);

	spin_lock_bh(&br->lock);

	rtnl_unlock();

}



static ssize_t store_stp_state(struct device *d,

			       struct device_attribute *attr, const char *buf,

			       size_t len)

{

	return store_bridge_parm(d, buf, len, set_stp_state);

	struct net_bridge *br = to_bridge(d);

	char *endp;

	unsigned long val;



	if (!capable(CAP_NET_ADMIN))

		return -EPERM;



	val = simple_strtoul(buf, &endp, 0);

	if (endp == buf)

		return -EINVAL;



	rtnl_lock();

	br_stp_set_enabled(br, val);

	rtnl_unlock();



}

static DEVICE_ATTR(stp_state, S_IRUGO | S_IWUSR, show_stp_state,

		   store_stp_state);