summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-02-26 06:49:24 +0000
committerDavid S. Miller <davem@davemloft.net>2009-03-03 00:47:46 -0800
commit5a5990d3090b03745a9548a6f5edef02095675cf (patch)
treed8d08f214886b544b706fa491f437792846c3658
parent07555c9880da3e2e96e5eae00a03b44cc076deaf (diff)
downloadlinux-5a5990d3090b03745a9548a6f5edef02095675cf.tar.gz
linux-5a5990d3090b03745a9548a6f5edef02095675cf.tar.bz2
linux-5a5990d3090b03745a9548a6f5edef02095675cf.zip
net: Avoid race between network down and sysfs
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/net-sysfs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 6ac29a46e23e..484f58750eba 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -77,7 +77,9 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr,
if (endp == buf)
goto err;
- rtnl_lock();
+ if (!rtnl_trylock())
+ return -ERESTARTSYS;
+
if (dev_isalive(net)) {
if ((ret = (*set)(net, new)) == 0)
ret = len;