patch-2.1.4 linux/net/unix/af_unix.c

• Lines: 57
• Date: Sun Oct 13 21:11:27 1996
• Orig file: v2.1.3/linux/net/unix/af_unix.c
• Orig date: Thu Oct 10 19:10:58 1996

diff -u --recursive --new-file v2.1.3/linux/net/unix/af_unix.c linux/net/unix/af_unix.c
@@ -686,7 +686,7 @@
 	if(len>256|| len <=0)
 		return NULL;
 	cm=kmalloc(len, GFP_KERNEL);
-	memcpy_fromfs(cm, userp, len);
+	copy_from_user(cm, userp, len);
 	return cm;
 }
 
@@ -696,7 +696,7 @@
  
 static void unix_returnrights(void *userp, int len, struct cmsghdr *cm)
 {
-	memcpy_tofs(userp, cm, len);
+	copy_to_user(userp, cm, len);
 	kfree(cm);
 }
 
@@ -1127,7 +1127,7 @@
 			}
 
 			num=min(skb->len,len-done);
-			memcpy_tofs(sp, skb->data, num);
+			copy_to_user(sp, skb->data, num);
 
 			if (skb->h.filp!=NULL)
 				unix_detach_fds(skb,cm);
@@ -1198,13 +1198,13 @@
 	{
 	
 		case TIOCOUTQ:
-			err=verify_area(VERIFY_WRITE,(void *)arg,sizeof(unsigned long));
+			err=verify_area(VERIFY_WRITE,(void *)arg,sizeof(int));
 			if(err)
 				return err;
 			amount=sk->sndbuf-sk->wmem_alloc;
 			if(amount<0)
 				amount=0;
-			put_fs_long(amount,(unsigned long *)arg);
+			put_user(amount, (int *)arg);
 			return 0;
 		case TIOCINQ:
 		{
@@ -1214,10 +1214,10 @@
 			/* These two are safe on a single CPU system as only user tasks fiddle here */
 			if((skb=skb_peek(&sk->receive_queue))!=NULL)
 				amount=skb->len;
-			err=verify_area(VERIFY_WRITE,(void *)arg,sizeof(unsigned long));
+			err=verify_area(VERIFY_WRITE,(void *)arg,sizeof(int));
 			if(err)
 				return err;
-			put_fs_long(amount,(unsigned long *)arg);
+			put_user(amount, (int *)arg);
 			return 0;
 		}