Skip to contentSkip to conversation

X25: remove bkl in routing ioctls

PATCH Applied Andrew Hendry 2 participants 2 messages Nov 18, 2010 – Nov 19, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 4/4 X25: remove bkl in routing ioctls

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

---
 net/x25/af_x25.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
net/x25/af_x25.c +0 -4
index 2f235a6..2351ace 100644
@@ -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();
Signature · 1 line
1.7.1