summaryrefslogtreecommitdiff
path: root/net/core/wireless.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-21 01:36:10 +0400
committerJeff Garzik <jeff@garzik.org>2006-04-21 01:36:10 +0400
commitf18b95c3e2ab0f75b23a5aabab0bc8f99bd6bbf3 (patch)
tree9ff4b7efdb2ca1e83c2a413f06268b268098b3ca /net/core/wireless.c
parent17c281ab3e33be63693687d3db7ac9cf2bbdfd66 (diff)
parent848ef8555296f25d9226d3bc43ce4028835ed633 (diff)
downloadlinux-f18b95c3e2ab0f75b23a5aabab0bc8f99bd6bbf3.tar.xz
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/core/wireless.c')
-rw-r--r--net/core/wireless.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/core/wireless.c b/net/core/wireless.c
index 81d6995fcfdb..d2bc72d318f7 100644
--- a/net/core/wireless.c
+++ b/net/core/wireless.c
@@ -1726,6 +1726,14 @@ int wireless_rtnetlink_get(struct net_device * dev,
if(!IW_IS_GET(request->cmd))
return -EOPNOTSUPP;
+ /* If command is `get the encoding parameters', check if
+ * the user has the right to do it */
+ if (request->cmd == SIOCGIWENCODE ||
+ request->cmd == SIOCGIWENCODEEXT) {
+ if (!capable(CAP_NET_ADMIN))
+ return -EPERM;
+ }
+
/* Special cases */
if(request->cmd == SIOCGIWSTATS)
/* Get Wireless Stats */