diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2017-10-15 18:16:33 +0100 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-11-05 23:54:37 -0500 |
| commit | 5195d13e883d59f6bbfb997775991af39a28f3d1 (patch) | |
| tree | e78351fc8e5b087ac69d1ec8ec9a36f0b4fba798 | |
| parent | 34a5c6ecc7ae4470cc6f415cbc3c5b97c15023fe (diff) | |
scsi: sg: Re-fix off by one in sg_fill_request_table()
[ Upstream commit 587c3c9f286cee5c9cac38d28c8ae1875f4ec85b ]
Commit 109bade9c625 ("scsi: sg: use standard lists for sg_requests")
introduced an off-by-one error in sg_ioctl(), which was fixed by commit
bd46fc406b30 ("scsi: sg: off by one in sg_ioctl()").
Unfortunately commit 4759df905a47 ("scsi: sg: factor out
sg_fill_request_table()") moved that code, and reintroduced the
bug (perhaps due to a botched rebase). Fix it again.
Fixes: 4759df905a47 ("scsi: sg: factor out sg_fill_request_table()")
Cc: stable@vger.kernel.org
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | drivers/scsi/sg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index fbdba7925723..102806a961da 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -842,7 +842,7 @@ sg_fill_request_table(Sg_fd *sfp, sg_req_info_t *rinfo) val = 0; list_for_each_entry(srp, &sfp->rq_list, entry) { - if (val > SG_MAX_QUEUE) + if (val >= SG_MAX_QUEUE) break; rinfo[val].req_state = srp->done + 1; rinfo[val].problem = |