patch-2.1.4 linux/drivers/isdn/isdn_ppp.c

• Lines: 54
• Date: Sun Oct 13 21:11:12 1996
• Orig file: v2.1.3/linux/drivers/isdn/isdn_ppp.c
• Orig date: Sat Aug 31 19:13:03 1996

diff -u --recursive --new-file v2.1.3/linux/drivers/isdn/isdn_ppp.c linux/drivers/isdn/isdn_ppp.c
@@ -353,7 +353,7 @@
 	int r;
 	if ((r = verify_area(VERIFY_READ, (void *) b, sizeof(unsigned long))))
 		 return r;
-	memcpy_fromfs((void *) val, b, sizeof(unsigned long));
+	copy_from_user((void *) val, b, sizeof(unsigned long));
 	return 0;
 }
 
@@ -365,7 +365,7 @@
 	int r;
 	if ((r = verify_area(VERIFY_WRITE, b, sizeof(unsigned long))))
 		 return r;
-	memcpy_tofs(b, (void *) &val, sizeof(unsigned long));
+	copy_to_user(b, (void *) &val, sizeof(unsigned long));
 	return 0;
 }
 
@@ -607,7 +607,7 @@
 	}
 	if (b->len < count)
 		count = b->len;
-	memcpy_tofs(buf, b->buf, count);
+	copy_to_user(buf, b->buf, count);
 	kfree(b->buf);
 	b->buf = NULL;
 	is->first = b;
@@ -650,7 +650,7 @@
 				return count;
 			}
 			skb->free = 1;
-			memcpy_fromfs(skb_put(skb, count), buf, count);
+			copy_from_user(skb_put(skb, count), buf, count);
 			if(isdn_writebuf_skb_stub(lp->isdn_device,lp->isdn_channel,skb) != count) {
 				if(lp->sav_skb) {
 					dev_kfree_skb(lp->sav_skb,FREE_WRITE);
@@ -1475,7 +1475,7 @@
 		}
 #endif
 	}
-	memcpy_tofs (res, &t, sizeof (struct ppp_stats));
+	copy_to_user (res, &t, sizeof (struct ppp_stats));
 	return 0;
 
 }
@@ -1500,7 +1500,7 @@
 			len = strlen(PPP_VERSION) + 1;
 			error = verify_area(VERIFY_WRITE, r, len);
 			if (!error)
-				memcpy_tofs(r, PPP_VERSION, len);
+				copy_to_user(r, PPP_VERSION, len);
 			break;
 		case SIOCGPPPSTATS:
 			error = isdn_ppp_dev_ioctl_stats (lp->ppp_slot, ifr, dev);