Commit af38f298 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller

net: Fix bridgeing sysfs handling of rtnl_lock

Holding rtnl_lock when we are unregistering the sysfs files can
deadlock if we unconditionally take rtnl_lock in a sysfs file.  So fix
it with the now familiar patter of: rtnl_trylock and syscall_restart()
Signed-off-by: default avatarEric W. Biederman <ebiederm@aristanetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b8adb5e
...@@ -172,7 +172,8 @@ static ssize_t store_stp_state(struct device *d, ...@@ -172,7 +172,8 @@ static ssize_t store_stp_state(struct device *d,
if (endp == buf) if (endp == buf)
return -EINVAL; return -EINVAL;
rtnl_lock(); if (!rtnl_trylock())
return restart_syscall();
br_stp_set_enabled(br, val); br_stp_set_enabled(br, val);
rtnl_unlock(); rtnl_unlock();
......
...@@ -189,7 +189,8 @@ static ssize_t brport_store(struct kobject * kobj, ...@@ -189,7 +189,8 @@ static ssize_t brport_store(struct kobject * kobj,
val = simple_strtoul(buf, &endp, 0); val = simple_strtoul(buf, &endp, 0);
if (endp != buf) { if (endp != buf) {
rtnl_lock(); if (!rtnl_trylock())
return restart_syscall();
if (p->dev && p->br && brport_attr->store) { if (p->dev && p->br && brport_attr->store) {
spin_lock_bh(&p->br->lock); spin_lock_bh(&p->br->lock);
ret = brport_attr->store(p, val); ret = brport_attr->store(p, val);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment