[PATCH 4/4] rose check error on memcpy_fromiovec (resend)

[Chris Wright <chrisw@xxxxxxxx>]

Check the return value on memcpy_fromiovec().

 net/rose/af_rose.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

===== net/rose/af_rose.c 1.37 vs edited =====
--- 1.37/net/rose/af_rose.c     Fri Jan  9 01:56:39 2004
+++ edited/net/rose/af_rose.c   Fri Jan 16 14:15:17 2004
@@ -1083,7 +1083,11 @@
 
        asmptr = skb->h.raw = skb_put(skb, len);
 
-       memcpy_fromiovec(asmptr, msg->msg_iov, len);
+       err = memcpy_fromiovec(asmptr, msg->msg_iov, len);
+       if (err) {
+               kfree_skb(skb);
+               return err;
+       }
 
        /*
         *      If the Q BIT Include socket option is in force, the first
@@ -1133,8 +1137,10 @@
                frontlen = skb_headroom(skb);
 
                while (skb->len > 0) {
-                       if ((skbn = sock_alloc_send_skb(sk, frontlen + 
ROSE_PACLEN, 0, &err)) == NULL)
+                       if ((skbn = sock_alloc_send_skb(sk, frontlen + 
ROSE_PACLEN, 0, &err)) == NULL) {
+                               kfree_skb(skb);
                                return err;
+                       }
 
                        skbn->sk   = sk;
                        skbn->free = 1;
@@ -1159,7 +1165,7 @@
                }
 
                skb->free = 1;
-               kfree_skb(skb, FREE_WRITE);
+               kfree_skb(skb);
        } else {
                skb_queue_tail(&sk->sk_write_queue, skb);               /* 
Throw it on the queue */
        }