Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 587c3c9f authored by Ben Hutchings's avatar Ben Hutchings Committed by Martin K. Petersen
Browse files

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



Commit 109bade9 ("scsi: sg: use standard lists for sg_requests")
introduced an off-by-one error in sg_ioctl(), which was fixed by commit
bd46fc40 ("scsi: sg: off by one in sg_ioctl()").

Unfortunately commit 4759df90 ("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: 4759df90 ("scsi: sg: factor out sg_fill_request_table()")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Acked-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 45348de2

drivers/scsi/sg.c

+1 −1
Original line number Diff line number Diff line
@@ -837,7 +837,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 =