patch-2.1.10 linux/net/ipv6/raw.c

• Lines: 53
• Date: Thu Nov 14 18:26:17 1996
• Orig file: v2.1.9/linux/net/ipv6/raw.c
• Orig date: Sun Nov 10 20:12:31 1996

diff -u --recursive --new-file v2.1.9/linux/net/ipv6/raw.c linux/net/ipv6/raw.c
@@ -124,9 +124,12 @@
 	
 	copied = min(len, skb->tail - skb->h.raw);
 	
-	skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
+	err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
 	sk->stamp=skb->stamp;
 
+	if (err)
+		return err;
+
 	/* Copy the address. */
 	if (sin6) 
 	{
@@ -166,15 +169,15 @@
 	struct in6_addr *daddr;
 };
 
-static void rawv6_getfrag(const void *data, struct in6_addr *saddr, 
+static int rawv6_getfrag(const void *data, struct in6_addr *saddr, 
 			  char *buff, unsigned int offset, unsigned int len)
 {
 	struct iovec *iov = (struct iovec *) data;
 
-	memcpy_fromiovecend(buff, iov, offset, len);
+	return memcpy_fromiovecend(buff, iov, offset, len);
 }
 
-static void rawv6_frag_cksum(const void *data, struct in6_addr *addr,
+static int rawv6_frag_cksum(const void *data, struct in6_addr *addr,
 			     char *buff, unsigned int offset, 
 			     unsigned int len)
 {
@@ -220,6 +223,7 @@
 			printk(KERN_DEBUG "icmp: cksum offset too big\n");
 		}
 	}	
+	return 0; 
 }
 
 
@@ -354,8 +358,10 @@
 
 	switch (optname) {
 		case ICMPV6_FILTER:
-			copy_from_user(&opt->filter, optval,
+			err = copy_from_user(&opt->filter, optval,
 				       sizeof(struct icmp6_filter));
+			if (err)
+				err = -EFAULT;
 			break;
 		default:
 			err = -ENOPROTOOPT;