dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Nelson Elhage 2010-12-08 10:13:55 -08:00 committed by David S. Miller
parent 0833847552
commit 0c62fc6dd0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/econet/af_econet.c
View File

@ -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) {