summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_tgt_lib.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2007-11-19 11:28:48 +1100
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-01-11 18:22:50 -0600
commit4a03d90e35bc5273d27301fa669d4b2103196f94 (patch)
treea2ce1aa93b63ed3b8ac1adf9bd696f57fbf3c8ca /drivers/scsi/scsi_tgt_lib.c
parenta8aae4d3427a5cf7c92b50125e35ea6cb9ba7394 (diff)
downloadop-kernel-dev-4a03d90e35bc5273d27301fa669d4b2103196f94.zip
op-kernel-dev-4a03d90e35bc5273d27301fa669d4b2103196f94.tar.gz
[SCSI] BUG_ON() impossible condition in sg list counting
If blk_rq_map_sg wrote more than was allocated in the scatterlist, BUG_ON() is probably the right thing to do. [jejb: rejections fixed up] Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Acked-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/scsi_tgt_lib.c')
-rw-r--r--drivers/scsi/scsi_tgt_lib.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index 241815e..93ece8f 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -368,14 +368,9 @@ static int scsi_tgt_init_cmd(struct scsi_cmnd *cmd, gfp_t gfp_mask)
dprintk("cmd %p cnt %d %lu\n", cmd, scsi_sg_count(cmd),
rq_data_dir(rq));
count = blk_rq_map_sg(rq->q, rq, scsi_sglist(cmd));
- if (likely(count <= scsi_sg_count(cmd))) {
- cmd->use_sg = count;
- return 0;
- }
-
- eprintk("cmd %p cnt %d\n", cmd, scsi_sg_count(cmd));
- scsi_free_sgtable(cmd);
- return -EINVAL;
+ BUG_ON(count > cmd->use_sg);
+ cmd->use_sg = count;
+ return 0;
}
/* TODO: test this crap and replace bio_map_user with new interface maybe */
OpenPOWER on IntegriCloud