forked from luck/tmp_suning_uos_patched
X25: remove bkl in timestamp ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
70be998c2b
commit
1ecd66bf2c
|
@ -1387,19 +1387,15 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
|||
|
||||
case SIOCGSTAMP:
|
||||
rc = -EINVAL;
|
||||
lock_kernel();
|
||||
if (sk)
|
||||
rc = sock_get_timestamp(sk,
|
||||
(struct timeval __user *)argp);
|
||||
unlock_kernel();
|
||||
break;
|
||||
case SIOCGSTAMPNS:
|
||||
rc = -EINVAL;
|
||||
lock_kernel();
|
||||
if (sk)
|
||||
rc = sock_get_timestampns(sk,
|
||||
(struct timespec __user *)argp);
|
||||
unlock_kernel();
|
||||
break;
|
||||
case SIOCGIFADDR:
|
||||
case SIOCSIFADDR:
|
||||
|
@ -1689,19 +1685,15 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd,
|
|||
break;
|
||||
case SIOCGSTAMP:
|
||||
rc = -EINVAL;
|
||||
lock_kernel();
|
||||
if (sk)
|
||||
rc = compat_sock_get_timestamp(sk,
|
||||
(struct timeval __user*)argp);
|
||||
unlock_kernel();
|
||||
break;
|
||||
case SIOCGSTAMPNS:
|
||||
rc = -EINVAL;
|
||||
lock_kernel();
|
||||
if (sk)
|
||||
rc = compat_sock_get_timestampns(sk,
|
||||
(struct timespec __user*)argp);
|
||||
unlock_kernel();
|
||||
break;
|
||||
case SIOCGIFADDR:
|
||||
case SIOCSIFADDR:
|
||||
|
|
Loading…
Reference in New Issue
Block a user