|
@@ -1387,19 +1387,15 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
|
|
|
|
|
case SIOCGSTAMP:
|
|
case SIOCGSTAMP:
|
|
rc = -EINVAL;
|
|
rc = -EINVAL;
|
|
- lock_kernel();
|
|
|
|
if (sk)
|
|
if (sk)
|
|
rc = sock_get_timestamp(sk,
|
|
rc = sock_get_timestamp(sk,
|
|
(struct timeval __user *)argp);
|
|
(struct timeval __user *)argp);
|
|
- unlock_kernel();
|
|
|
|
break;
|
|
break;
|
|
case SIOCGSTAMPNS:
|
|
case SIOCGSTAMPNS:
|
|
rc = -EINVAL;
|
|
rc = -EINVAL;
|
|
- lock_kernel();
|
|
|
|
if (sk)
|
|
if (sk)
|
|
rc = sock_get_timestampns(sk,
|
|
rc = sock_get_timestampns(sk,
|
|
(struct timespec __user *)argp);
|
|
(struct timespec __user *)argp);
|
|
- unlock_kernel();
|
|
|
|
break;
|
|
break;
|
|
case SIOCGIFADDR:
|
|
case SIOCGIFADDR:
|
|
case SIOCSIFADDR:
|
|
case SIOCSIFADDR:
|
|
@@ -1689,19 +1685,15 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd,
|
|
break;
|
|
break;
|
|
case SIOCGSTAMP:
|
|
case SIOCGSTAMP:
|
|
rc = -EINVAL;
|
|
rc = -EINVAL;
|
|
- lock_kernel();
|
|
|
|
if (sk)
|
|
if (sk)
|
|
rc = compat_sock_get_timestamp(sk,
|
|
rc = compat_sock_get_timestamp(sk,
|
|
(struct timeval __user*)argp);
|
|
(struct timeval __user*)argp);
|
|
- unlock_kernel();
|
|
|
|
break;
|
|
break;
|
|
case SIOCGSTAMPNS:
|
|
case SIOCGSTAMPNS:
|
|
rc = -EINVAL;
|
|
rc = -EINVAL;
|
|
- lock_kernel();
|
|
|
|
if (sk)
|
|
if (sk)
|
|
rc = compat_sock_get_timestampns(sk,
|
|
rc = compat_sock_get_timestampns(sk,
|
|
(struct timespec __user*)argp);
|
|
(struct timespec __user*)argp);
|
|
- unlock_kernel();
|
|
|
|
break;
|
|
break;
|
|
case SIOCGIFADDR:
|
|
case SIOCGIFADDR:
|
|
case SIOCSIFADDR:
|
|
case SIOCSIFADDR:
|