Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[linux-2.6-omap-h63xx.git] / net / can / raw.c

diff --git a/net/can/raw.c b/net/can/raw.c
index 6e0663faaf9fcdea78d0f57947489e429d764cdd..0703cba4bf9f29bc269be1fd57a0215e4f37d420 100644 (file)
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -99,13 +99,14 @@ static void raw_rcv(struct sk_buff *skb, void *data)
        struct raw_sock *ro = raw_sk(sk);
        struct sockaddr_can *addr;
 
-       if (!ro->recv_own_msgs) {
-               /* check the received tx sock reference */
-               if (skb->sk == sk) {
-                       kfree_skb(skb);
-                       return;
-               }
-       }
+       /* check the received tx sock reference */
+       if (!ro->recv_own_msgs && skb->sk == sk)
+               return;
+
+       /* clone the given skb to be able to enqueue it into the rcv queue */
+       skb = skb_clone(skb, GFP_ATOMIC);
+       if (!skb)
+               return;
 
        /*
         *  Put the datagram to the queue so that raw_recvmsg() can
@@ -641,17 +642,12 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
 
        skb = sock_alloc_send_skb(sk, size, msg->msg_flags & MSG_DONTWAIT,
                                  &err);
-       if (!skb) {
-               dev_put(dev);
-               return err;
-       }
+       if (!skb)
+               goto put_dev;
 
        err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size);
-       if (err < 0) {
-               kfree_skb(skb);
-               dev_put(dev);
-               return err;
-       }
+       if (err < 0)
+               goto free_skb;
        skb->dev = dev;
        skb->sk  = sk;
 
@@ -660,9 +656,16 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
        dev_put(dev);
 
        if (err)
-               return err;
+               goto send_failed;
 
        return size;
+
+free_skb:
+       kfree_skb(skb);
+put_dev:
+       dev_put(dev);
+send_failed:
+       return err;
 }
 
 static int raw_recvmsg(struct kiocb *iocb, struct socket *sock,