diff options
Diffstat (limited to 'net')
| -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) | |||
| 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(); |