From: Nelson Elhage <nelhage@ksplice.com>
Date: Wed, 8 Dec 2010 18:13:55 +0000 (-0800)
Subject: econet: Do the correct cleanup after an unprivileged SIOCSIFADDR.
X-Git-Tag: v6.6-pxa1908~32643^2~30
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=0c62fc6dd02c8d793c75ae76a9b6881fc36388ad;p=linux.git

econet: Do the correct cleanup after an unprivileged SIOCSIFADDR.

We need to drop the mutex and do a dev_put, so set an error code and break like
the other paths, instead of returning directly.

Signed-off-by: Nelson Elhage <nelhage@ksplice.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 13992e1d2726..f180371fa415 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -661,8 +661,10 @@ 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;
+		if (!capable(CAP_NET_ADMIN)) {
+			err = -EPERM;
+			break;
+		}
 
 		edev = dev->ec_ptr;
 		if (edev == NULL) {