diff options
| author | andrew hendry <andrew.hendry@gmail.com> | 2010-11-18 13:21:35 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-19 12:40:02 -0800 |
| commit | 0670b8ae66daf1d326c7bd10e73daff5f18fcf92 (patch) | |
| tree | 03d0b76eabba6154572e44b66c6c1c1f4fee5bfd /net/x25/af_x25.c | |
| parent | 54aafbd4989a684ca876e49bf3e6eb931654dc02 (diff) | |
| download | linux-stable-0670b8ae66daf1d326c7bd10e73daff5f18fcf92.tar.gz linux-stable-0670b8ae66daf1d326c7bd10e73daff5f18fcf92.tar.bz2 linux-stable-0670b8ae66daf1d326c7bd10e73daff5f18fcf92.zip | |
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/af_x25.c')
| -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 2f235a6cb3b1..2351aceb296d 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) rc = -EPERM; if (!capable(CAP_NET_ADMIN)) break; - lock_kernel(); rc = x25_route_ioctl(cmd, argp); - unlock_kernel(); break; case SIOCX25GSUBSCRIP: lock_kernel(); @@ -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(); |