Commit aee0b37b authored by Todd Poynor's avatar Todd Poynor Committed by Greg Kroah-Hartman

scsi: sg: recheck MMAP_IO request length with lock held

commit 8d26f491 upstream.

Commit 1bc0eb04 ("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: default avatarTodd Poynor <toddpoynor@google.com>
Acked-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b0f24dc0
...@@ -1743,9 +1743,12 @@ sg_start_req(Sg_request *srp, unsigned char *cmd) ...@@ -1743,9 +1743,12 @@ sg_start_req(Sg_request *srp, unsigned char *cmd)
!sfp->res_in_use) { !sfp->res_in_use) {
sfp->res_in_use = 1; sfp->res_in_use = 1;
sg_link_reserve(sfp, srp, dxfer_len); sg_link_reserve(sfp, srp, dxfer_len);
} else if ((hp->flags & SG_FLAG_MMAP_IO) && sfp->res_in_use) { } else if (hp->flags & SG_FLAG_MMAP_IO) {
res = -EBUSY; /* sfp->res_in_use == 1 */
if (dxfer_len > rsv_schp->bufflen)
res = -ENOMEM;
mutex_unlock(&sfp->f_mutex); mutex_unlock(&sfp->f_mutex);
return -EBUSY; return res;
} else { } else {
res = sg_build_indirect(req_schp, sfp, dxfer_len); res = sg_build_indirect(req_schp, sfp, dxfer_len);
if (res) { if (res) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment