Commit 72426053 authored Oct 15, 2017 by Ben Hutchings Committed by Greg Kroah-Hartman Nov 02, 2017

scsi: sg: Re-fix off by one in sg_fill_request_table()



commit 587c3c9f286cee5c9cac38d28c8ae1875f4ec85b upstream.

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()")
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 16c847d6

drivers/scsi/sg.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -863,7 +863,7 @@ sg_fill_request_table(Sg_fd sfp, sg_req_info_t rinfo)

	val = 0;		val = 0;
	list_for_each_entry(srp, &sfp->rq_list, entry) {		list_for_each_entry(srp, &sfp->rq_list, entry) {
	if (val > SG_MAX_QUEUE)		if (val >= SG_MAX_QUEUE)
	break;		break;
	rinfo[val].req_state = srp->done + 1;		rinfo[val].req_state = srp->done + 1;
	rinfo[val].problem =		rinfo[val].problem =