Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0670b8ae authored by andrew hendry's avatar andrew hendry Committed by David S. Miller
Browse files

X25: remove bkl in routing ioctls 



Routing doesn't use the socket data and is protected by x25_route_list_lock

Signed-off-by: default avatarAndrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 54aafbd4

net/x25/af_x25.c

+0 −4
Original line number Diff line number Diff line
@@ -1412,9 +1412,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
			rc = -EPERM;

			if (!capable(CAP_NET_ADMIN))

				break;

			lock_kernel();

			rc = x25_route_ioctl(cmd, argp);

			unlock_kernel();

			break;

		case SIOCX25GSUBSCRIP:

			lock_kernel();
@@ -1710,9 +1708,7 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, 
		rc = -EPERM;

		if (!capable(CAP_NET_ADMIN))

			break;

		lock_kernel();

		rc = x25_route_ioctl(cmd, argp);

		unlock_kernel();

		break;

	case SIOCX25GSUBSCRIP:

		lock_kernel();