patch-2.1.17 linux/net/ipv4/raw.c

• Lines: 36
• Date: Thu Dec 19 21:34:41 1996
• Orig file: v2.1.16/linux/net/ipv4/raw.c
• Orig date: Thu Dec 12 19:37:26 1996

diff -u --recursive --new-file v2.1.16/linux/net/ipv4/raw.c linux/net/ipv4/raw.c
@@ -125,7 +125,7 @@
 
 struct rawfakehdr 
 {
-	const char *from;
+	const unsigned char *from;
 	u32	saddr;
 };
 
@@ -139,8 +139,8 @@
   
 static int raw_getfrag(const void *p, char *to, unsigned int offset, unsigned int fraglen)
 {
-	struct rawfakehdr *rfh = (struct rawfakehdr*)p;
-	return copy_from_user(to, (const unsigned char *)rfh->from+offset, fraglen);
+	struct rawfakehdr *rfh = (struct rawfakehdr *) p;
+	return copy_from_user(to, rfh->from + offset, fraglen);
 }
 
 /*
@@ -149,11 +149,10 @@
  
 static int raw_getrawfrag(const void *p, char *to, unsigned int offset, unsigned int fraglen)
 {
-	struct rawfakehdr *rfh = (struct rawfakehdr*)p;
-	int err; 
-	err = copy_from_user(to, (const unsigned char *)p+offset, fraglen);
-	if (err)
-		return err; 
+	struct rawfakehdr *rfh = (struct rawfakehdr *) p;
+
+	if (copy_from_user(to, rfh->from + offset, fraglen))
+		return -EFAULT;
 	if (offset==0) {
 		struct iphdr *iph = (struct iphdr *)to;
 		if (!iph->saddr)