X25 remove bkl in subscription ioctls

Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/x25.h b/include/net/x25.h
index 1479cb4a41fc988fba91183c512c950f07db71d2..a06119a051291b83e5ec58c7dc239fa4ab965d85 100644 (file)
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -315,6 +315,8 @@ extern struct list_head x25_route_list;
 extern rwlock_t x25_route_list_lock;
 extern struct list_head x25_forward_list;
 extern rwlock_t x25_forward_list_lock;
+extern struct list_head x25_neigh_list;
+extern rwlock_t x25_neigh_list_lock;
 
 extern int x25_proc_init(void);
 extern void x25_proc_exit(void);

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 2351aceb296d378fc32a94a8e6c3c2d0fb7d76e2..45be72c3f940cde4664a90bad56af7b5bbd35b9e 100644 (file)
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1415,17 +1415,13 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                        rc = x25_route_ioctl(cmd, argp);
                        break;
                case SIOCX25GSUBSCRIP:
-                       lock_kernel();
                        rc = x25_subscr_ioctl(cmd, argp);
-                       unlock_kernel();
                        break;
                case SIOCX25SSUBSCRIP:
                        rc = -EPERM;
                        if (!capable(CAP_NET_ADMIN))
                                break;
-                       lock_kernel();
                        rc = x25_subscr_ioctl(cmd, argp);
-                       unlock_kernel();
                        break;
                case SIOCX25GFACILITIES: {
                        struct x25_facilities fac = x25->facilities;
@@ -1646,16 +1642,20 @@ static int compat_x25_subscr_ioctl(unsigned int cmd,
        dev_put(dev);
 
        if (cmd == SIOCX25GSUBSCRIP) {
+               read_lock_bh(&x25_neigh_list_lock);
                x25_subscr.extended = nb->extended;
                x25_subscr.global_facil_mask = nb->global_facil_mask;
+               read_unlock_bh(&x25_neigh_list_lock);
                rc = copy_to_user(x25_subscr32, &x25_subscr,
                                sizeof(*x25_subscr32)) ? -EFAULT : 0;
        } else {
                rc = -EINVAL;
                if (x25_subscr.extended == 0 || x25_subscr.extended == 1) {
                        rc = 0;
+                       write_lock_bh(&x25_neigh_list_lock);
                        nb->extended = x25_subscr.extended;
                        nb->global_facil_mask = x25_subscr.global_facil_mask;
+                       write_unlock_bh(&x25_neigh_list_lock);
                }
        }
        x25_neigh_put(nb);
@@ -1711,17 +1711,13 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd,
                rc = x25_route_ioctl(cmd, argp);
                break;
        case SIOCX25GSUBSCRIP:
-               lock_kernel();
                rc = compat_x25_subscr_ioctl(cmd, argp);
-               unlock_kernel();
                break;
        case SIOCX25SSUBSCRIP:
                rc = -EPERM;
                if (!capable(CAP_NET_ADMIN))
                        break;
-               lock_kernel();
                rc = compat_x25_subscr_ioctl(cmd, argp);
-               unlock_kernel();
                break;
        case SIOCX25GFACILITIES:
        case SIOCX25SFACILITIES:

diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c
index 73e7b954ad288229df4d03bc164f07da183444cc..4c81f6abb65b80dd608267baa35fefacaa2eb12d 100644 (file)
--- a/net/x25/x25_link.c
+++ b/net/x25/x25_link.c
@@ -31,8 +31,8 @@
 #include <linux/init.h>
 #include <net/x25.h>
 
-static LIST_HEAD(x25_neigh_list);
-static DEFINE_RWLOCK(x25_neigh_list_lock);
+LIST_HEAD(x25_neigh_list);
+DEFINE_RWLOCK(x25_neigh_list_lock);
 
 static void x25_t20timer_expiry(unsigned long);
 
@@ -360,16 +360,20 @@ int x25_subscr_ioctl(unsigned int cmd, void __user *arg)
        dev_put(dev);
 
        if (cmd == SIOCX25GSUBSCRIP) {
+               read_lock_bh(&x25_neigh_list_lock);
                x25_subscr.extended          = nb->extended;
                x25_subscr.global_facil_mask = nb->global_facil_mask;
+               read_unlock_bh(&x25_neigh_list_lock);
                rc = copy_to_user(arg, &x25_subscr,
                                  sizeof(x25_subscr)) ? -EFAULT : 0;
        } else {
                rc = -EINVAL;
                if (!(x25_subscr.extended && x25_subscr.extended != 1)) {
                        rc = 0;
+                       write_lock_bh(&x25_neigh_list_lock);
                        nb->extended         = x25_subscr.extended;
                        nb->global_facil_mask = x25_subscr.global_facil_mask;
+                       write_unlock_bh(&x25_neigh_list_lock);
                }
        }
        x25_neigh_put(nb);