diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2009-05-13 17:00:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-18 22:15:59 -0700 |
| commit | af38f2989572704a846a5577b5ab3b1e2885cbfb (patch) | |
| tree | d706c0e977992c360f484399886abd0e0c33de58 /net/bridge | |
| parent | 9b8adb5ea005fe73acd5dd58f9bd47eafa74c9d1 (diff) | |
| download | op-kernel-dev-af38f2989572704a846a5577b5ab3b1e2885cbfb.zip op-kernel-dev-af38f2989572704a846a5577b5ab3b1e2885cbfb.tar.gz | |
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: Eric W. Biederman <ebiederm@aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_sysfs_br.c | 3 | ||||
| -rw-r--r-- | net/bridge/br_sysfs_if.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index 603d892..ee4820a 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c @@ -172,7 +172,8 @@ static ssize_t store_stp_state(struct device *d, if (endp == buf) return -EINVAL; - rtnl_lock(); + if (!rtnl_trylock()) + return restart_syscall(); br_stp_set_enabled(br, val); rtnl_unlock(); diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index 02b2d50..4a3cdf8 100644 --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c @@ -189,7 +189,8 @@ static ssize_t brport_store(struct kobject * kobj, val = simple_strtoul(buf, &endp, 0); if (endp != buf) { - rtnl_lock(); + if (!rtnl_trylock()) + return restart_syscall(); if (p->dev && p->br && brport_attr->store) { spin_lock_bh(&p->br->lock); ret = brport_attr->store(p, val); |
