Patchwork [4/4] X25: remove bkl in routing ioctls

login
register
mail settings
Submitter andrew hendry
Date Nov. 18, 2010, 11:21 p.m.
Message ID <1290122495.20070.63.camel@jaunty>
Download mbox | patch
Permalink /patch/72169/
State Accepted
Delegated to: David Miller
Headers show

Comments

andrew hendry - Nov. 18, 2010, 11:21 p.m.
Routing doesn't use the socket data and is protected by x25_route_list_lock

Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>

---
 net/x25/af_x25.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
David Miller - Nov. 19, 2010, 8:41 p.m.
From: Andrew Hendry <andrew.hendry@gmail.com>
Date: Fri, 19 Nov 2010 10:21:35 +1100

> 
> Routing doesn't use the socket data and is protected by x25_route_list_lock
> 
> Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 2f235a6..2351ace 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -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();