summaryrefslogtreecommitdiff
path: root/net/core/wireless.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-27 12:55:53 +0400
committerJeff Garzik <jeff@garzik.org>2006-04-27 12:55:53 +0400
commit7894eaf291238a62a565e9e9777483beeb00eeae (patch)
tree43c08830d2030d39d719f3f3d54a0e9b36554770 /net/core/wireless.c
parent9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (diff)
parentacc696d93dcf993dec123d69d599979e1456ffec (diff)
downloadlinux-7894eaf291238a62a565e9e9777483beeb00eeae.tar.xz
Merge branch 'upstream' into irq-pio
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 */