Skip to contentSkip to conversation

drivers/isdn/hisax/* - compile warning

PATCH In review Stephen Biggs 1 participant 1 message Feb 14, 2005 Kernel janitors

lore
Share & tools
lore
#0 lore raw

PATCH 5/21 drivers/isdn/hisax/* - compile warning

Description: compile warning cleanup - handle copy_to/from_user error returns

drivers/isdn/hisax/config.c +12 -2
diff -Nurdp -X dontdiff-osdl linux-2.6.11-rc3-mm2-original/drivers/isdn/hisax/config.c linux-2.6.11-rc3-mm2/drivers/isdn/hisax/config.c
@@ -631,7 +631,12 @@ int HiSax_readstatus(u_char __user *buf,
 		count = cs->status_end - cs->status_read + 1;
 		if (count >= len)
 			count = len;
-		copy_to_user(p, cs->status_read, count);
+		if (copy_to_user(p, cs->status_read, count)) {
+			printk(KERN_ERR
+				"HiSax:%s: copy_to_user failed!\n",
+				__FUNCTION__);
+			return -EFAULT;
+		}
 		cs->status_read += count;
 		if (cs->status_read > cs->status_end)
 			cs->status_read = cs->status_buf;
@@ -642,7 +647,12 @@ int HiSax_readstatus(u_char __user *buf,
 				cnt = HISAX_STATUS_BUFSIZE;
 			else
 				cnt = count;
-			copy_to_user(p, cs->status_read, cnt);
+			if (copy_to_user(p, cs->status_read, cnt)) {
+				printk(KERN_ERR
+					"HiSax:%s: copy_to_user failed!\n",
+					__FUNCTION__);
+				return -EFAULT;
+			}
 			p += cnt;
 			cs->status_read += cnt % HISAX_STATUS_BUFSIZE;
 			count -= cnt;

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors