linux-kernel - Re: [PATCH] sg: recheck MMAP_IO request length with lock held

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <db6faa64-7ef2-9a72-f186-8691313ad18a@interlog.com>
Date:   Tue, 22 Aug 2017 17:37:10 -0400
From:   Douglas Gilbert <dgilbert@...erlog.com>
To:     Todd Poynor <toddpoynor@...gle.com>,
        "James E.J. Bottomley" <jejb@...ux.vnet.ibm.com>,
        "Martin K. Petersen" <martin.petersen@...cle.com>
Cc:     linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org,
        Hannes Reinecke <hare@...e.de>
Subject: Re: [PATCH] sg: recheck MMAP_IO request length with lock held

On 2017-08-16 12:48 AM, Todd Poynor wrote:
> 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@...gle.com>
Acked-by: Douglas Gilbert <dgilbert@...erlog.com>

Thanks.

> ---
>   drivers/scsi/sg.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
> index d7ff71e0c85c..3a44b4bc872b 100644
> --- a/drivers/scsi/sg.c
> +++ b/drivers/scsi/sg.c
> @@ -1735,9 +1735,12 @@ sg_start_req(Sg_request *srp, unsigned char *cmd)
>   		    !sfp->res_in_use) {
>   			sfp->res_in_use = 1;
>   			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);
> -			return -EBUSY;
> +			return res;
>   		} else {
>   			res = sg_build_indirect(req_schp, sfp, dxfer_len);
>   			if (res) {
>