diff options
author | andrew hendry <andrew.hendry@gmail.com> | 2010-11-18 08:21:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-19 15:40:02 -0500 |
commit | 0670b8ae66daf1d326c7bd10e73daff5f18fcf92 (patch) | |
tree | 03d0b76eabba6154572e44b66c6c1c1f4fee5bfd /net/x25 | |
parent | 54aafbd4989a684ca876e49bf3e6eb931654dc02 (diff) |
X25: remove bkl in routing ioctls
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>
Diffstat (limited to 'net/x25')
-rw-r--r-- | net/x25/af_x25.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 2f235a6cb3b..2351aceb296 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
@@ -1412,9 +1412,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
1412 | rc = -EPERM; | 1412 | rc = -EPERM; |
1413 | if (!capable(CAP_NET_ADMIN)) | 1413 | if (!capable(CAP_NET_ADMIN)) |
1414 | break; | 1414 | break; |
1415 | lock_kernel(); | ||
1416 | rc = x25_route_ioctl(cmd, argp); | 1415 | rc = x25_route_ioctl(cmd, argp); |
1417 | unlock_kernel(); | ||
1418 | break; | 1416 | break; |
1419 | case SIOCX25GSUBSCRIP: | 1417 | case SIOCX25GSUBSCRIP: |
1420 | lock_kernel(); | 1418 | lock_kernel(); |
@@ -1710,9 +1708,7 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, | |||
1710 | rc = -EPERM; | 1708 | rc = -EPERM; |
1711 | if (!capable(CAP_NET_ADMIN)) | 1709 | if (!capable(CAP_NET_ADMIN)) |
1712 | break; | 1710 | break; |
1713 | lock_kernel(); | ||
1714 | rc = x25_route_ioctl(cmd, argp); | 1711 | rc = x25_route_ioctl(cmd, argp); |
1715 | unlock_kernel(); | ||
1716 | break; | 1712 | break; |
1717 | case SIOCX25GSUBSCRIP: | 1713 | case SIOCX25GSUBSCRIP: |
1718 | lock_kernel(); | 1714 | lock_kernel(); |