summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorLuis Carlos Cobo <luisca@cozybit.com>2008-03-31 15:10:22 -0700
committerJohn W. Linville <linville@tuxdriver.com>2008-04-01 17:14:11 -0400
commit73bb3e4a7a9f1b8d5f89c3991bd0c904ab0b8e27 (patch)
tree01a6474fa7c14c6c76ff5ca1f9dd86365ac20bcc /net/mac80211
parent7e879b551f1ada78d66fa5c6914aa1744b9c97d2 (diff)
downloadlinux-stable-73bb3e4a7a9f1b8d5f89c3991bd0c904ab0b8e27.tar.gz
linux-stable-73bb3e4a7a9f1b8d5f89c3991bd0c904ab0b8e27.tar.bz2
linux-stable-73bb3e4a7a9f1b8d5f89c3991bd0c904ab0b8e27.zip
mac80211: fix deadlocks in debugfs_netdev.c
The bug shows up with CONFIG_PREEMPT enabled. Pointed out by Andrew Morton. Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/debugfs_netdev.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index 0e921aef8ecf..3e19d42e61cb 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -31,11 +31,13 @@ static ssize_t ieee80211_if_read(
ssize_t ret = -EINVAL;
read_lock(&dev_base_lock);
- if (sdata->dev->reg_state == NETREG_REGISTERED) {
+ if (sdata->dev->reg_state == NETREG_REGISTERED)
ret = (*format)(sdata, buf, sizeof(buf));
- ret = simple_read_from_buffer(userbuf, count, ppos, buf, ret);
- }
read_unlock(&dev_base_lock);
+
+ if (ret != -EINVAL)
+ ret = simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+
return ret;
}
@@ -51,13 +53,13 @@ static ssize_t ieee80211_if_write(
memset(buf, 0x00, sizeof(buf));
buf_size = min(count, (sizeof(buf)-1));
- read_lock(&dev_base_lock);
if (copy_from_user(buf, userbuf, buf_size))
- goto endwrite;
+ return count;
+ read_lock(&dev_base_lock);
if (sdata->dev->reg_state == NETREG_REGISTERED)
(*format)(sdata, buf);
-endwrite:
read_unlock(&dev_base_lock);
+
return count;
}
#endif