Skip to content

Commit a2e71dc

Browse files
toddpoynorgregkh
authored andcommitted
scsi: sg: recheck MMAP_IO request length with lock held
commit 8d26f491116feaa0b16de370b6a7ba40a40fa0b4 upstream. Commit 1bc0eb044615 ("scsi: sg: protect accesses to 'reserved' page array") adds needed concurrency protection for the "reserve" buffer. Some checks that are initially made outside the lock are replicated once the lock is taken to ensure the checks and resulting decisions are made using consistent state. The check that a request with flag SG_FLAG_MMAP_IO set fits in the reserve buffer also needs to be performed again under the lock to ensure the reserve buffer length compared against matches the value in effect when the request is linked to the reserve buffer. An -ENOMEM should be returned in this case, instead of switching over to an indirect buffer as for non-MMAP_IO requests. Signed-off-by: Todd Poynor <toddpoynor@google.com> 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>
1 parent 0d7592a commit a2e71dc

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

drivers/scsi/sg.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1757,9 +1757,12 @@ sg_start_req(Sg_request *srp, unsigned char *cmd)
17571757
!sfp->res_in_use) {
17581758
sfp->res_in_use = 1;
17591759
sg_link_reserve(sfp, srp, dxfer_len);
1760-
} else if ((hp->flags & SG_FLAG_MMAP_IO) && sfp->res_in_use) {
1760+
} else if (hp->flags & SG_FLAG_MMAP_IO) {
1761+
res = -EBUSY; /* sfp->res_in_use == 1 */
1762+
if (dxfer_len > rsv_schp->bufflen)
1763+
res = -ENOMEM;
17611764
mutex_unlock(&sfp->f_mutex);
1762-
return -EBUSY;
1765+
return res;
17631766
} else {
17641767
res = sg_build_indirect(req_schp, sfp, dxfer_len);
17651768
if (res) {

0 commit comments

Comments
 (0)