patch-2.1.4 linux/drivers/net/slip.c

Next file: linux/drivers/net/strip.c
Previous file: linux/drivers/net/sdla.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.3/linux/drivers/net/slip.c linux/drivers/net/slip.c
@@ -1019,7 +1019,7 @@
 		return err;
 	}
 
-	memcpy_fromfs(dev->dev_addr, addr, AX25_ADDR_LEN);	/* addr is an AX.25 shifted ASCII mac address */
+	copy_from_user(dev->dev_addr, addr, AX25_ADDR_LEN);	/* addr is an AX.25 shifted ASCII mac address */
 
 	return 0;
 }
@@ -1053,7 +1053,7 @@
 		if (err)  {
 			return err;
 		}
-		memcpy_tofs(arg, sl->dev->name, strlen(sl->dev->name) + 1);
+		copy_to_user(arg, sl->dev->name, strlen(sl->dev->name) + 1);
 		return 0;
 
 	case SIOCGIFENCAP:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov