1 files changed, 14 insertions, 8 deletions

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 5b1ec586bae6..d1835b1bc8c4 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -259,7 +259,7 @@ int raw_rcv(struct sock *sk, struct sk_buff *skb)
         return 0;
 }
 
-static int raw_send_hdrinc(struct sock *sk, void *from, int length,
+static int raw_send_hdrinc(struct sock *sk, void *from, size_t length,
                         struct rtable *rt, 
                         unsigned int flags)
 {
@@ -298,7 +298,7 @@ static int raw_send_hdrinc(struct sock *sk, void *from, int length,
                 goto error_fault;
 
         /* We don't modify invalid header */
-        if (length >= sizeof(*iph) && iph->ihl * 4 <= length) {
+        if (length >= sizeof(*iph) && iph->ihl * 4U <= length) {
                 if (!iph->saddr)
                         iph->saddr = rt->rt_src;
                 iph->check   = 0;
@@ -332,7 +332,7 @@ static void raw_probe_proto_opt(struct flowi *fl, struct msghdr *msg)
         u8 __user *type = NULL;
         u8 __user *code = NULL;
         int probed = 0;
-        int i;
+        unsigned int i;
 
         if (!msg->msg_iov)
                 return;
@@ -384,7 +384,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
         int err;
 
         err = -EMSGSIZE;
-        if (len < 0 || len > 0xFFFF)
+        if (len > 0xFFFF)
                 goto out;
 
         /*
@@ -514,7 +514,10 @@ done:
                 kfree(ipc.opt);
         ip_rt_put(rt);
 
-out:    return err < 0 ? err : len;
+out:
+        if (err < 0)
+                return err;
+        return len;
 
 do_confirm:
         dst_confirm(&rt->u.dst);
@@ -610,7 +613,10 @@ static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                 copied = skb->len;
 done:
         skb_free_datagram(sk, skb);
-out:    return err ? err : copied;
+out:
+        if (err)
+                return err;
+        return copied;
 }
 
 static int raw_init(struct sock *sk)
@@ -691,11 +697,11 @@ static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg)
                         struct sk_buff *skb;
                         int amount = 0;
 
-                        spin_lock_irq(&sk->sk_receive_queue.lock);
+                        spin_lock_bh(&sk->sk_receive_queue.lock);
                         skb = skb_peek(&sk->sk_receive_queue);
                         if (skb != NULL)
                                 amount = skb->len;
-                        spin_unlock_irq(&sk->sk_receive_queue.lock);
+                        spin_unlock_bh(&sk->sk_receive_queue.lock);
                         return put_user(amount, (int __user *)arg);
                 }