patch-2.3.44 linux/drivers/char/mem.c

• Lines: 39
• Date: Fri Feb 11 11:19:59 2000
• Orig file: v2.3.43/linux/drivers/char/mem.c
• Orig date: Thu Feb 10 17:11:08 2000

diff -u --recursive --new-file v2.3.43/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -58,9 +58,6 @@
 #if defined(CONFIG_ADB)
 extern void adbdev_init(void);
 #endif
-#ifdef CONFIG_USB
-extern void usb_init(void);
-#endif
 #ifdef CONFIG_PHONE
 extern void telephony_init(void);
 #endif
@@ -248,14 +245,16 @@
 		if (p < PAGE_SIZE && read > 0) {
 			size_t tmp = PAGE_SIZE - p;
 			if (tmp > read) tmp = read;
-			clear_user(buf, tmp);
+			if (clear_user(buf, tmp))
+				return -EFAULT;
 			buf += tmp;
 			p += tmp;
 			read -= tmp;
 			count -= tmp;
 		}
 #endif
-		copy_to_user(buf, (char *)p, read);
+		if (copy_to_user(buf, (char *)p, read))
+			return -EFAULT;
 		p += read;
 		buf += read;
 		count -= read;
@@ -581,9 +580,6 @@
 		printk("unable to get major %d for memory devs\n", MEM_MAJOR);
 	rand_initialize();
 	raw_init();
-#ifdef CONFIG_USB
-	usb_init();
-#endif
 #ifdef CONFIG_I2C
 	i2c_init_all();
 #endif