diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-15 13:54:00 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-15 13:54:00 +0900 |
| commit | 344ac148442e3223ac1b0e29ef3d3fb73c5ed61a (patch) | |
| tree | 7b654a74727c57344296768c3a2d7d03b17f37ea /block/blk-map.c | |
| parent | 8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec (diff) | |
| parent | 0143832cc96d0bf78486297aad5c8fb2c2ead02a (diff) | |
| download | op-kernel-dev-344ac148442e3223ac1b0e29ef3d3fb73c5ed61a.zip op-kernel-dev-344ac148442e3223ac1b0e29ef3d3fb73c5ed61a.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/urgent
Diffstat (limited to 'block/blk-map.c')
| -rw-r--r-- | block/blk-map.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-map.c b/block/blk-map.c index d4a586d..5d5dbe4 100644 --- a/block/blk-map.c +++ b/block/blk-map.c @@ -205,6 +205,8 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq, unaligned = 1; break; } + if (!iov[i].iov_len) + return -EINVAL; } if (unaligned || (q->dma_pad_mask & len) || map_data) |
