Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[mv-sheeva.git] / block / blk-map.c

diff --git a/block/blk-map.c b/block/blk-map.c
index d4a586d8691ec5ed37311d1e3fc76aa0c310828f..e663ac2d8e68f70ff17ce274f3cebec16c1dd18c 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -201,6 +201,9 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
        for (i = 0; i < iov_count; i++) {
                unsigned long uaddr = (unsigned long)iov[i].iov_base;
 
+               if (!iov[i].iov_len)
+                       return -EINVAL;
+
                if (uaddr & queue_dma_alignment(q)) {
                        unaligned = 1;
                        break;