From 8c8cdbdb07c24801a80c002160c0cb61f6056196 Mon Sep 17 00:00:00 2001
From: Jean Tourrilhes <jt@hpl.hp.com>
Date: Fri, 14 Apr 2006 10:47:26 -0700
Subject: [PATCH] --- yaml --- r: 26097 b: refs/heads/master c:
 848ef8555296f25d9226d3bc43ce4028835ed633 h: refs/heads/master i:   26095:
 65e310b23f857bc30442e93b659cf330b9f32cf4 v: v3

---
 [refs]                    | 2 +-
 trunk/net/core/wireless.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bdde1da5c5fd..2f6b99da9a39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a392149ee14d1631d8632060c1fc3082729f83c8
+refs/heads/master: 848ef8555296f25d9226d3bc43ce4028835ed633
diff --git a/trunk/net/core/wireless.c b/trunk/net/core/wireless.c
index 81d6995fcfdb..d2bc72d318f7 100644
--- a/trunk/net/core/wireless.c
+++ b/trunk/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 */