aboutsummaryrefslogtreecommitdiffstats
path: root/net/econet
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2010-11-24 11:49:53 -0800
committerDavid S. Miller <davem@davemloft.net>2010-11-24 11:49:53 -0800
commit16c41745c7b92a243d0874f534c1655196c64b74 (patch)
treef30468ec3c9beb4d375ca1b0350c934e07d3b54f /net/econet
parentfa0e846494792e722d817b9d3d625a4ef4896c96 (diff)
downloadkernel_samsung_aries-16c41745c7b92a243d0874f534c1655196c64b74.zip
kernel_samsung_aries-16c41745c7b92a243d0874f534c1655196c64b74.tar.gz
kernel_samsung_aries-16c41745c7b92a243d0874f534c1655196c64b74.tar.bz2
econet: fix CVE-2010-3850
Add missing check for capable(CAP_NET_ADMIN) in SIOCSIFADDR operation. Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/econet')
-rw-r--r--net/econet/af_econet.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index e366f1b..d41ba8e 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -661,6 +661,9 @@ static int ec_dev_ioctl(struct socket *sock, unsigned int cmd, void __user *arg)
err = 0;
switch (cmd) {
case SIOCSIFADDR:
+ if (!capable(CAP_NET_ADMIN))
+ return -EPERM;
+
edev = dev->ec_ptr;
if (edev == NULL) {
/* Magic up a new one. */