diff options
author | Nelson Elhage <nelhage@ksplice.com> | 2010-12-08 13:13:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-08 15:13:42 -0500 |
commit | 0c62fc6dd02c8d793c75ae76a9b6881fc36388ad (patch) | |
tree | 49dbe734dc75fe318ca83e2eae823fbeae10dc48 /net | |
parent | 083384755252cde25af187acf1807a0f5edb901f (diff) |
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>
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 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) | |||
661 | err = 0; | 661 | err = 0; |
662 | switch (cmd) { | 662 | switch (cmd) { |
663 | case SIOCSIFADDR: | 663 | case SIOCSIFADDR: |
664 | if (!capable(CAP_NET_ADMIN)) | 664 | if (!capable(CAP_NET_ADMIN)) { |
665 | return -EPERM; | 665 | err = -EPERM; |
666 | break; | ||
667 | } | ||
666 | 668 | ||
667 | edev = dev->ec_ptr; | 669 | edev = dev->ec_ptr; |
668 | if (edev == NULL) { | 670 | if (edev == NULL) { |