Skip to contentSkip to conversation

drivers/ide/* - compile warning cleanup

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

lore
Share & tools
lore
#0 lore raw

PATCH 4/21 drivers/ide/* - compile warning cleanup

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

drivers/ide/ide-tape.c +13 -2
diff -Nurdp -X dontdiff-osdl linux-2.6.11-rc3-mm2-original/drivers/ide/ide-tape.c linux-2.6.11-rc3-mm2/drivers/ide/ide-tape.c
@@ -2610,7 +2610,13 @@ static void idetape_copy_stage_from_user
 		}
 #endif /* IDETAPE_DEBUG_BUGS */
 		count = min((unsigned int)(bh->b_size - atomic_read(&bh->b_count)), (unsigned int)n);
-		copy_from_user(bh->b_data + atomic_read(&bh->b_count), buf, count);
+		if (copy_from_user(bh->b_data + atomic_read(&bh->b_count), buf, count)) {
+#if IDETAPE_DEBUG_BUGS
+			printk(KERN_ERR "ide-tape/%s: copy_from_user failed!\n",
+					__FUNCTION__);
+#endif /* IDETAPE_DEBUG_BUGS */
+			return;
+		}
 		n -= count;
 		atomic_add(count, &bh->b_count);
 		buf += count;
@@ -2637,7 +2643,12 @@ static void idetape_copy_stage_to_user (
 		}
 #endif /* IDETAPE_DEBUG_BUGS */
 		count = min(tape->b_count, n);
-		copy_to_user(buf, tape->b_data, count);
+		if (copy_to_user(buf, tape->b_data, count)) {
+#if IDETAPE_DEBUG_BUGS
+			printk(KERN_ERR "ide-tape/%s: copy_to_user failed!\n",__FUNCTION__);
+#endif /* IDETAPE_DEBUG_BUGS */
+			return;
+		}
 		n -= count;
 		tape->b_data += count;
 		tape->b_count -= count;

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