X25: remove bkl in timestamp ioctls (1ecd66bf) · Commits · 戴 / test

net/x25/af_x25.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -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: