diff options
| author | Nelson Elhage <nelhage@ksplice.com> | 2010-12-08 10:13:55 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-07 13:58:28 -0800 |
| commit | 32f2fd79682b8b961c01c65689d2999e2081834f (patch) | |
| tree | cfa2122931b5cf413208679d1def4fdef26b3330 /net | |
| parent | 414bdc25810282f9cf56a3335e695c263e487727 (diff) | |
econet: Do the correct cleanup after an unprivileged SIOCSIFADDR.
[ Upstream commit 0c62fc6dd02c8d793c75ae76a9b6881fc36388ad]
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: Greg Kroah-Hartman <gregkh@suse.de>
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 d2fe17d09e91..10d404132c49 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) { |