diff options
author | andrew hendry <andrew.hendry@gmail.com> | 2010-11-18 08:21:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-19 15:40:01 -0500 |
commit | 1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc (patch) | |
tree | 023478099312ee1aa78646b5c28ccea68d7dab9b /net/x25 | |
parent | 70be998c2b44f942f11383496622500136816acb (diff) |
X25: remove bkl in timestamp ioctls
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 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index c99029bc411c..22597838cc76 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
@@ -1387,19 +1387,15 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
1387 | 1387 | ||
1388 | case SIOCGSTAMP: | 1388 | case SIOCGSTAMP: |
1389 | rc = -EINVAL; | 1389 | rc = -EINVAL; |
1390 | lock_kernel(); | ||
1391 | if (sk) | 1390 | if (sk) |
1392 | rc = sock_get_timestamp(sk, | 1391 | rc = sock_get_timestamp(sk, |
1393 | (struct timeval __user *)argp); | 1392 | (struct timeval __user *)argp); |
1394 | unlock_kernel(); | ||
1395 | break; | 1393 | break; |
1396 | case SIOCGSTAMPNS: | 1394 | case SIOCGSTAMPNS: |
1397 | rc = -EINVAL; | 1395 | rc = -EINVAL; |
1398 | lock_kernel(); | ||
1399 | if (sk) | 1396 | if (sk) |
1400 | rc = sock_get_timestampns(sk, | 1397 | rc = sock_get_timestampns(sk, |
1401 | (struct timespec __user *)argp); | 1398 | (struct timespec __user *)argp); |
1402 | unlock_kernel(); | ||
1403 | break; | 1399 | break; |
1404 | case SIOCGIFADDR: | 1400 | case SIOCGIFADDR: |
1405 | case SIOCSIFADDR: | 1401 | case SIOCSIFADDR: |
@@ -1689,19 +1685,15 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, | |||
1689 | break; | 1685 | break; |
1690 | case SIOCGSTAMP: | 1686 | case SIOCGSTAMP: |
1691 | rc = -EINVAL; | 1687 | rc = -EINVAL; |
1692 | lock_kernel(); | ||
1693 | if (sk) | 1688 | if (sk) |
1694 | rc = compat_sock_get_timestamp(sk, | 1689 | rc = compat_sock_get_timestamp(sk, |
1695 | (struct timeval __user*)argp); | 1690 | (struct timeval __user*)argp); |
1696 | unlock_kernel(); | ||
1697 | break; | 1691 | break; |
1698 | case SIOCGSTAMPNS: | 1692 | case SIOCGSTAMPNS: |
1699 | rc = -EINVAL; | 1693 | rc = -EINVAL; |
1700 | lock_kernel(); | ||
1701 | if (sk) | 1694 | if (sk) |
1702 | rc = compat_sock_get_timestampns(sk, | 1695 | rc = compat_sock_get_timestampns(sk, |
1703 | (struct timespec __user*)argp); | 1696 | (struct timespec __user*)argp); |
1704 | unlock_kernel(); | ||
1705 | break; | 1697 | break; |
1706 | case SIOCGIFADDR: | 1698 | case SIOCGIFADDR: |
1707 | case SIOCSIFADDR: | 1699 | case SIOCSIFADDR: |