linux-kernel - RE: [PATCH] scsi: zero per-cmd driver data for each MQ I/O

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-next>] [day] [month] [year] [list]

Message-ID: <MWHPR03MB31361482F0BAE79275957D63CEE10@MWHPR03MB3136.namprd03.prod.outlook.com>
Date:   Mon, 15 May 2017 23:32:58 +0000
From:   Long Li <longli@...rosoft.com>
To:     Bart Van Assche <Bart.VanAssche@...disk.com>,
        "jejb@...ux.vnet.ibm.com" <jejb@...ux.vnet.ibm.com>,
        "linux-scsi@...r.kernel.org" <linux-scsi@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "martin.petersen@...cle.com" <martin.petersen@...cle.com>
CC:     KY Srinivasan <kys@...rosoft.com>,
        Stephen Hemminger <sthemmin@...rosoft.com>
Subject: RE: [PATCH] scsi: zero per-cmd driver data for each MQ I/O

> -----Original Message-----
> From: Bart Van Assche [mailto:Bart.VanAssche@...disk.com]
> Sent: Monday, May 15, 2017 4:03 PM
> To: jejb@...ux.vnet.ibm.com; linux-scsi@...r.kernel.org; linux-
> kernel@...r.kernel.org; Long Li <longli@...rosoft.com>;
> martin.petersen@...cle.com
> Cc: Long Li <longli@...rosoft.com>
> Subject: Re: [Possible Phish Fraud][PATCH] scsi: zero per-cmd driver data for
> each MQ I/O
> 
> On Wed, 2017-05-10 at 14:07 -0700, Long Li wrote:
> > From: Long Li <longli@...rosoft.com>
> >
> > Lower layer driver may not initialize private data before use. Zero
> > them out to prevent use of stale data.
> >
> > Signed-off-by: Long Li <longli@...rosoft.com>
> > ---
> >  drivers/scsi/scsi_lib.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index
> > 19125d7..a821593 100644
> > --- a/drivers/scsi/scsi_lib.c
> > +++ b/drivers/scsi/scsi_lib.c
> > @@ -1850,7 +1850,7 @@ static int scsi_mq_prep_fn(struct request *req)
> >
> >  	/* zero out the cmd, except for the embedded scsi_request */
> >  	memset((char *)cmd + sizeof(cmd->req), 0,
> > -		sizeof(*cmd) - sizeof(cmd->req));
> > +		sizeof(*cmd) - sizeof(cmd->req) + shost->hostt->cmd_size);
> >
> >  	req->special = cmd;
> 
> Hello Long,
> 
> Sorry but this patch looks wrong to me. Since scsi_mq_prep_fn() is called
> after scsi_req_init(), erasing struct scsi_request from scsi_mq_prep_fn() will
> erase the values that were set by scsi_req_init(). That includes information
> like the pointer to the SCSI CDB and the CDB itself. See e.g.
> scsi_execute().
> 
> Did you come up with this patch after source reading or did you come up with
> this patch while chasing a bug?

Thanks for looking! Yes this is for chasing a bug. 

Actually scsi_mq_prep_fn() doesn't touch cmd->req (which is the struct scsi_request mentioned in your email).

With the patch, we also zero the private data used by lower layer driver, in addition to the private data in scsi_cmnd.

> 
> Thanks,
> 
> Bart.