drivers/ide/* - compile warning cleanup

PATCH In review [email protected] 1 participant 1 message Mar 6, 2005 libata

lore

Share & tools

lore

[email protected]

author

2005-03-06 10:42 UTC #0 lore raw

PATCH 5/6 drivers/ide/* - compile warning cleanup

compile warning cleanup - handle copy_to/from_user error returns

Signed-off-by Stephen Biggs <[email protected]>

Signed-off-by Domen Puncer <[email protected]>

---

 kj-domen/drivers/ide/ide-tape.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

drivers/ide/ide-tape.c renamed from drivers/ide/ide-tape.c~return_code-drivers_ide +13 -2

diff -puN drivers/ide/ide-tape.c~return_code-drivers_ide 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;