diff options
author | Nelson Elhage <nelhage@ksplice.com> | 2010-12-08 10:13:55 -0800 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-04-17 16:16:04 -0400 |
commit | d4fb962614d39a25d88d99b8090ef6c15b23fa90 (patch) | |
tree | eaede29624159ef02ecf7dfccd2b36b411e2a4a0 /net | |
parent | d89f6fc68da8ca411226e24d762826f0fff99007 (diff) |
econet: Do the correct cleanup after an unprivileged SIOCSIFADDR.
commit 0c62fc6dd02c8d793c75ae76a9b6881fc36388ad upstream
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>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | 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 2e41c761f414..e40e6b023500 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) { |