[PATCH] scsi: Fix more error handling in SCSI_IOCTL_SEND_COMMAND

[Tony Battersby]

Fix an error path in SCSI_IOCTL_SEND_COMMAND that calls
blk_put_request(rq) on an invalid IS_ERR(rq) pointer.

Fixes: a492f075450f (block,scsi: fixup blk_get_request dead queue scenarios)
Signed-off-by: Tony Battersby to...@cybernetics.com
---

(resending, since no one picked it up last time)

For inclusion in 3.18 only.  This fixes a problem
introduced in 3.18.

Note: this fixes a *different* problem from Jan Kara's
patch with a similar subject line, which has already
been applied to mainline.

--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -458,7 +458,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk 
*disk, fmode_t mode,
rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_WAIT);
if (IS_ERR(rq)) {
err = PTR_ERR(rq);
-   goto error;
+   goto error_free_buffer;
}
blk_rq_set_block_pc(rq);
 
@@ -531,9 +531,11 @@ out:
}

 error:
+   blk_put_request(rq);
+
+error_free_buffer:
kfree(buffer);
-   if (rq)
-   blk_put_request(rq);
+
return err;
 }
 EXPORT_SYMBOL_GPL(sg_scsi_ioctl);

--
To unsubscribe from this list: send the line unsubscribe linux-scsi in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] scsi: Fix more error handling in SCSI_IOCTL_SEND_COMMAND

[Jens Axboe]

On 2014-11-10 15:40, Tony Battersby wrote:

Fix an error path in SCSI_IOCTL_SEND_COMMAND that calls
blk_put_request(rq) on an invalid IS_ERR(rq) pointer.

Fixes: a492f075450f (block,scsi: fixup blk_get_request dead queue scenarios)
Signed-off-by: Tony Battersby to...@cybernetics.com


Thanks, good catch. Might be an idea to have blk_put_request() do 
warn-and-return check on error pointers being passed in, just in case.


--
Jens Axboe

--
To unsubscribe from this list: send the line unsubscribe linux-scsi in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] scsi: Fix more error handling in SCSI_IOCTL_SEND_COMMAND

[Tony Battersby]

Fix an error path in SCSI_IOCTL_SEND_COMMAND that calls
blk_put_request(rq) on an invalid IS_ERR(rq) pointer.

Fixes: a492f075450f (block,scsi: fixup blk_get_request dead queue
scenarios)
Signed-off-by: Tony Battersby to...@cybernetics.com
---

For inclusion in 3.18 only.

This does not conflict with the other recent fix to sg_scsi_ioctl() from
Jan Kara.

--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -458,7 +458,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk 
*disk, fmode_t mode,
rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_WAIT);
if (IS_ERR(rq)) {
err = PTR_ERR(rq);
-   goto error;
+   goto error_free_buffer;
}
blk_rq_set_block_pc(rq);
 
@@ -532,9 +532,11 @@ out:
}

 error:
+   blk_put_request(rq);
+
+error_free_buffer:
kfree(buffer);
-   if (rq)
-   blk_put_request(rq);
+
return err;
 }
 EXPORT_SYMBOL_GPL(sg_scsi_ioctl);

--
To unsubscribe from this list: send the line unsubscribe linux-scsi in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html