From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Apr 2008 18:45:16 +0000 (-0700)
Subject: drivers/net/tehuti: use proper capability check for raw IO access
X-Git-Tag: v2.6.25.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0cc38c177802742d847469e0a06f4ad31d011cc;p=thirdparty%2Fkernel%2Fstable.git

drivers/net/tehuti: use proper capability check for raw IO access

commit 6203554207728f43cfb9fd48585cd6500da73d42 in mainline.

Yeah, in practice they both mean "root", but Alan correctly points out
that anybody who gets to do raw IO space accesses should really be using
CAP_SYS_RAWIO rather than CAP_NET_ADMIN.

Pointed-out-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index e83b166aa6b9a..432e837a17607 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -649,7 +649,7 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)
 		DBG("%d 0x%x 0x%x\n", data[0], data[1], data[2]);
 	}
 
-	if (!capable(CAP_NET_ADMIN))
+	if (!capable(CAP_SYS_RAWIO))
 		return -EPERM;
 
 	switch (data[0]) {