patch-2.1.10 linux/net/core/dev.c

• Lines: 104
• Date: Thu Nov 14 18:26:16 1996
• Orig file: v2.1.9/linux/net/core/dev.c
• Orig date: Tue Nov 12 15:56:15 1996

diff -u --recursive --new-file v2.1.9/linux/net/core/dev.c linux/net/core/dev.c
@@ -793,11 +793,10 @@
 	/*
 	 *	Fetch the caller's info block. 
 	 */
-	 
-	err=verify_area(VERIFY_WRITE, arg, sizeof(struct ifconf));
-	if(err)
-	  	return err;
-	copy_from_user(&ifc, arg, sizeof(struct ifconf));
+	
+	err = copy_from_user(&ifc, arg, sizeof(struct ifconf));
+	if (err)
+		return -EFAULT; 
 	len = ifc.ifc_len;
 	pos = ifc.ifc_buf;
 
@@ -805,11 +804,7 @@
 	 *	We now walk the device list filling each active device
 	 *	into the array.
 	 */
-	 
-	err=verify_area(VERIFY_WRITE,pos,len);
-	if(err)
-	  	return err;
-  	
+	
 	/*
 	 *	Loop over the interfaces, and write an info block for each. 
 	 */
@@ -835,7 +830,9 @@
 		 *	Write this block to the caller's space. 
 		 */
 		 
-		copy_to_user(pos, &ifr, sizeof(struct ifreq));
+		err = copy_to_user(pos, &ifr, sizeof(struct ifreq));
+		if (err)
+			return -EFAULT; 
 		pos += sizeof(struct ifreq);
 		len -= sizeof(struct ifreq);		
   	}
@@ -846,8 +843,10 @@
 	 
 	ifc.ifc_len = (pos - ifc.ifc_buf);
 	ifc.ifc_req = (struct ifreq *) ifc.ifc_buf;
-	copy_to_user(arg, &ifc, sizeof(struct ifconf));
-	
+	err = copy_to_user(arg, &ifc, sizeof(struct ifconf));
+	if (err)
+		return -EFAULT; 
+
 	/*
 	 *	Report how much was filled in
 	 */
@@ -956,17 +955,15 @@
 {
 	struct ifreq ifr;
 	struct device *dev;
-	int ret;
+	int ret, err;
 
 	/*
 	 *	Fetch the caller's info block into kernel space
 	 */
-
-	int err=verify_area(VERIFY_WRITE, arg, sizeof(struct ifreq));
-	if(err)
-		return err;
 	
-	copy_from_user(&ifr, arg, sizeof(struct ifreq));
+	err = copy_from_user(&ifr, arg, sizeof(struct ifreq));
+	if (err)
+		return -EFAULT; 
 
 	/*
 	 *	See which interface the caller is talking about. 
@@ -1266,8 +1263,13 @@
 			   (getset <= (SIOCDEVPRIVATE + 15))) {
 				if(dev->do_ioctl==NULL)
 					return -EOPNOTSUPP;
-				ret=dev->do_ioctl(dev, &ifr, getset);
-				copy_to_user(arg,&ifr,sizeof(struct ifreq));
+				ret = dev->do_ioctl(dev, &ifr, getset);
+				if (!ret)
+				{
+					err = copy_to_user(arg,&ifr,sizeof(struct ifreq));
+					if (err)
+						ret = -EFAULT;
+				}
 				break;
 			}
 			
@@ -1278,8 +1280,10 @@
  *	The load of calls that return an ifreq and ok (saves memory).
  */
 rarok:
-	copy_to_user(arg, &ifr, sizeof(struct ifreq));
-	return 0;
+	err = copy_to_user(arg, &ifr, sizeof(struct ifreq));
+	if (err)
+		err = -EFAULT;
+	return err;
 }