Commit 0670b8ae authored by andrew hendry's avatar andrew hendry Committed by David S. Miller

X25: remove bkl in routing ioctls

Routing doesn't use the socket data and is protected by x25_route_list_lock
Signed-off-by: default avatarAndrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 54aafbd4
...@@ -1412,9 +1412,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) ...@@ -1412,9 +1412,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
rc = -EPERM; rc = -EPERM;
if (!capable(CAP_NET_ADMIN)) if (!capable(CAP_NET_ADMIN))
break; break;
lock_kernel();
rc = x25_route_ioctl(cmd, argp); rc = x25_route_ioctl(cmd, argp);
unlock_kernel();
break; break;
case SIOCX25GSUBSCRIP: case SIOCX25GSUBSCRIP:
lock_kernel(); lock_kernel();
...@@ -1710,9 +1708,7 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, ...@@ -1710,9 +1708,7 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd,
rc = -EPERM; rc = -EPERM;
if (!capable(CAP_NET_ADMIN)) if (!capable(CAP_NET_ADMIN))
break; break;
lock_kernel();
rc = x25_route_ioctl(cmd, argp); rc = x25_route_ioctl(cmd, argp);
unlock_kernel();
break; break;
case SIOCX25GSUBSCRIP: case SIOCX25GSUBSCRIP:
lock_kernel(); lock_kernel();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment