1 files changed, 9 insertions, 8 deletions

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index e5d82d711cae..d44981f5a619 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -11,6 +11,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -63,7 +64,7 @@ static unsigned short circuit = 0x101;
 static HLIST_HEAD(nr_list);
 static DEFINE_SPINLOCK(nr_list_lock);
 
-static struct proto_ops nr_proto_ops;
+static const struct proto_ops nr_proto_ops;
 
 /*
  *      Socket removal during an interrupt is now safe.
@@ -1166,10 +1167,11 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         void __user *argp = (void __user *)arg;
         int ret;
 
-        lock_sock(sk);
         switch (cmd) {
         case TIOCOUTQ: {
                 long amount;
+
+                lock_sock(sk);
                 amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc);
                 if (amount < 0)
                         amount = 0;
@@ -1180,6 +1182,8 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         case TIOCINQ: {
                 struct sk_buff *skb;
                 long amount = 0L;
+
+                lock_sock(sk);
                 /* These two are safe on a single CPU system as only user tasks fiddle here */
                 if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL)
                         amount = skb->len;
@@ -1188,6 +1192,7 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         }
 
         case SIOCGSTAMP:
+                lock_sock(sk);
                 ret = sock_get_timestamp(sk, argp);
                 release_sock(sk);
                 return ret;
@@ -1202,21 +1207,17 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         case SIOCSIFNETMASK:
         case SIOCGIFMETRIC:
         case SIOCSIFMETRIC:
-                release_sock(sk);
                 return -EINVAL;
 
         case SIOCADDRT:
         case SIOCDELRT:
         case SIOCNRDECOBS:
-                release_sock(sk);
                 if (!capable(CAP_NET_ADMIN)) return -EPERM;
                 return nr_rt_ioctl(cmd, argp);
 
         default:
-                release_sock(sk);
-                return dev_ioctl(cmd, argp);
+                return -ENOIOCTLCMD;
         }
-        release_sock(sk);
 
         return 0;
 }
@@ -1337,7 +1338,7 @@ static struct net_proto_family nr_family_ops = {
         .owner          =       THIS_MODULE,
 };
 
-static struct proto_ops nr_proto_ops = {
+static const struct proto_ops nr_proto_ops = {
         .family         =       PF_NETROM,
         .owner          =       THIS_MODULE,
         .release        =       nr_release,