Pārlūkot izejas kodu

net-sysfs: Use rtnl_trylock in wireless sysfs methods.

The wireless sysfs methods like the rest of the networking sysfs
methods are removed with the rtnl_lock held and block until
the existing methods stop executing.  So use rtnl_trylock
and restart_syscall so that the code continues to work.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Eric W. Biederman 15 gadi atpakaļ
vecāks
revīzija
b8afe64161
1 mainītis faili ar 2 papildinājumiem un 1 dzēšanām
  1. 2 1
      net/core/net-sysfs.c

+ 2 - 1
net/core/net-sysfs.c

@@ -410,7 +410,8 @@ static ssize_t wireless_show(struct device *d, char *buf,
 	const struct iw_statistics *iw;
 	const struct iw_statistics *iw;
 	ssize_t ret = -EINVAL;
 	ssize_t ret = -EINVAL;
 
 
-	rtnl_lock();
+	if (!rtnl_trylock())
+		return restart_syscall();
 	if (dev_isalive(dev)) {
 	if (dev_isalive(dev)) {
 		iw = get_wireless_stats(dev);
 		iw = get_wireless_stats(dev);
 		if (iw)
 		if (iw)