Skip to content

Commit

Permalink
X25: remove bkl in routing ioctls
Browse files Browse the repository at this point in the history 
Routing doesn't use the socket data and is protected by x25_route_list_lock

Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
@AndrewHendry @davem330
AndrewHendry authored and davem330 committed Nov 19, 2010
1 parent 54aafbd commit 0670b8a
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions net/x25/af_x25.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1412,9 +1412,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
rc = -EPERM;
if (!capable(CAP_NET_ADMIN))
break;
lock_kernel();
rc = x25_route_ioctl(cmd, argp);
unlock_kernel();
break;
case SIOCX25GSUBSCRIP:
lock_kernel();
Expand Down Expand Up @@ -1710,9 +1708,7 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd,
rc = -EPERM;
if (!capable(CAP_NET_ADMIN))
break;
lock_kernel();
rc = x25_route_ioctl(cmd, argp);
unlock_kernel();
break;
case SIOCX25GSUBSCRIP:
lock_kernel();
Expand Down

0 comments on commit 0670b8a

Please sign in to comment.