diff options
| author | Nelson Elhage <nelhage@ksplice.com> | 2010-12-08 19:13:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 21:13:42 +0100 |
| commit | 0c62fc6dd02c8d793c75ae76a9b6881fc36388ad (patch) | |
| tree | 49dbe734dc75fe318ca83e2eae823fbeae10dc48 /net/econet | |
| parent | Merge branch 'sfc-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/bw... (diff) | |
| download | linux-0c62fc6dd02c8d793c75ae76a9b6881fc36388ad.tar.xz linux-0c62fc6dd02c8d793c75ae76a9b6881fc36388ad.zip | |
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/econet')
| -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) 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) { |