From 1e35a6d49216c4938531d89a1381f16333208ccc Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 30 Apr 2008 13:16:21 +0900 Subject: [PATCH] --- yaml --- r: 95822 b: refs/heads/master c: 9f5de6b105bfa45911d46566df0b36720b648c42 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/bsg.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e4280224b3d6..e845c49e2dd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0462590efe9a562dd2aa976ae2dc9cd2e6f5a0c6 +refs/heads/master: 9f5de6b105bfa45911d46566df0b36720b648c42 diff --git a/trunk/block/bsg.c b/trunk/block/bsg.c index 23ea4fd1a66d..d8b889d2e411 100644 --- a/trunk/block/bsg.c +++ b/trunk/block/bsg.c @@ -174,7 +174,11 @@ static int bsg_io_schedule(struct bsg_device *bd) static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, struct sg_io_v4 *hdr, int has_write_perm) { - memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */ + if (hdr->request_len > BLK_MAX_CDB) { + rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL); + if (!rq->cmd) + return -ENOMEM; + } if (copy_from_user(rq->cmd, (void *)(unsigned long)hdr->request, hdr->request_len)) @@ -211,8 +215,6 @@ bsg_validate_sgv4_hdr(struct request_queue *q, struct sg_io_v4 *hdr, int *rw) if (hdr->guard != 'Q') return -EINVAL; - if (hdr->request_len > BLK_MAX_CDB) - return -EINVAL; if (hdr->dout_xfer_len > (q->max_sectors << 9) || hdr->din_xfer_len > (q->max_sectors << 9)) return -EIO; @@ -302,6 +304,8 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr) } return rq; out: + if (rq->cmd != rq->__cmd) + kfree(rq->cmd); blk_put_request(rq); if (next_rq) { blk_rq_unmap_user(next_rq->bio); @@ -455,6 +459,8 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr, ret = rq->errors; blk_rq_unmap_user(bio); + if (rq->cmd != rq->__cmd) + kfree(rq->cmd); blk_put_request(rq); return ret;