patch-2.1.4 linux/drivers/cdrom/cdrom.c

• Lines: 14
• Date: Sun Oct 13 21:11:10 1996
• Orig file: v2.1.3/linux/drivers/cdrom/cdrom.c
• Orig date: Wed Aug 14 10:21:03 1996

diff -u --recursive --new-file v2.1.3/linux/drivers/cdrom/cdrom.c linux/drivers/cdrom/cdrom.c
@@ -268,11 +268,11 @@
 #define GETARG(type, x) { \
         int ret=verify_area(VERIFY_READ, (void *) arg, sizeof x); \
 	    if (ret) return ret; \
-	    memcpy_fromfs(&x, (type *) arg, sizeof x); }
+	    copy_from_user(&x, (type *) arg, sizeof x); }
 #define PUTARG(type, x) { \
 	    int ret=verify_area(VERIFY_WRITE, (void *) arg, sizeof x); \
 	    if (ret) return ret; \
-	    memcpy_tofs((type *) arg, &x, sizeof x); }
+	    copy_to_user((type *) arg, &x, sizeof x); }
 
 /* Some of the cdrom ioctls are not implemented here, because these
  * appear to be either too device-specific, or it is not clear to me