[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1291589152-4640-1-git-send-email-nelhage@ksplice.com>
Date: Sun, 5 Dec 2010 17:45:52 -0500
From: Nelson Elhage <nelhage@...lice.com>
To: "David S. Miller" <davem@...emloft.net>,
Phil Blundell <philb@....org>
Cc: netdev@...r.kernel.org, Nelson Elhage <nelhage@...lice.com>,
stable@...nel.org
Subject: [PATCH] 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.
Cc: stable@...nel.org
Signed-off-by: Nelson Elhage <nelhage@...lice.com>
---
net/econet/af_econet.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 13992e1..f180371 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) {
--
1.7.1.31.g6297e
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists