IronPort-SDR: W+NnQwW28+s7pn5MsqPmH1tHRC+di8l+B5j9+HdiP1rwJfA0epwDupg17wUwLZoFrvcOL5k4Tf
 kWuLZlPHeX83a8T4UPYNnKxYaxVd6xVucAIVSm3LpT51WuXhmvFdTpLS5ypHg4tyHHOfSwmpm2
 a4i7ODr6YftTE/O4HH3jro1yfqQ18JP2Py/TS2mTMaRiGl46Xh6HdXGN1/xPUY6Tm6qT7d8D1S
 AYdxP4Bu07afmRVZCeCCPLwNWf14ui23Y0ySxfLvhbxoYqK8JTSb46hhEyT6YKs9hEarnuYuGb
 0eVCxuNQKVmwI7I1GmleyQ5e
IronPort-SDR: Mx0axcajkZ9G4aLqRkPZO5wCnfn7KxFCGpyCGNIcrulLWpGf/C/afKRyYZjA4fFfEvJtEJIrhw
 BRLcicqQGXCdGZLFA3Xaj2gntZLN8mbaYmWKNctRY1eeZ8ITRBV606MfchrzCTfzE+z5Un94b4
 zTijFEIS13siG5Bu5Kf3mBkbbOfLLME/sL0ky/6DKGbk5FVB/BfMCvAHsdkJ29H+3ET9I0sqz+
 eO0F9Mn8HErXMK1O6HYqSj85fh32v6sm0pIcj1cwcExYFM2U2QS8WSKye/oXtUrGmR+F2GRY+K
 lto=
WDCIronportException: Internal
Message-ID: <632b632d-a34b-5a75-973b-29586ef9ecae@opensource.wdc.com>
Date:   Tue, 14 Dec 2021 08:50:44 +0900
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0)
 Gecko/20100101 Thunderbird/91.4.0
Subject: Re: [PATCH RESEND 2] libata: if T_LENGTH is zero, dma direction
 should be DMA_NONE
Content-Language: en-US
To:     George Kennedy <george.kennedy@oracle.com>
Cc:     linux-ide@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
References: <1f57bc3d-d125-7e09-4699-0338ddcc50f1@oracle.com>
 <c6212443-e40a-2813-1920-905e89884204@opensource.wdc.com>
 <e3ff85bc-bf01-c90d-298f-4cbd30b460c1@oracle.com>
From:   Damien Le Moal <damien.lemoal@opensource.wdc.com>
Organization: Western Digital
In-Reply-To: <e3ff85bc-bf01-c90d-298f-4cbd30b460c1@oracle.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 2021/12/14 7:15, George Kennedy wrote:
> 
> 
> On 12/13/2021 4:37 PM, Damien Le Moal wrote:
>> On 2021/12/14 0:33, George Kennedy wrote:
>>> Avoid data corruption by rejecting pass-through commands where
>>> T_LENGTH is zero (No data is transferred) and the dma direction
>>> is not DMA_NONE.
>>>
>>> Cc:<stable@vger.kernel.org>  # 5.4.y
>> 5.4 only ? What about other LTS versions ? They do not have that bug ?
> Our distros are based on 5.4.y, 5.15.y and 4.14.y, so the fix should go 
> there,
> but it looks like the fix is also needed in: 5.14.y, 5.13.y, 5.10.y, and 
> 4.19.y.

Then please resend with:

Cc: stable@vger.kernel.org

No version specified.

> 
> Thank you,
> George
>>
>>> Reported-by: syzkaller<syzkaller@googlegroups.com>
>>> Signed-off-by: George Kennedy<george.kennedy@oracle.com>
>>> ---
>>>    drivers/ata/libata-scsi.c | 6 ++++++
>>>    1 file changed, 6 insertions(+)
>>>
>>> diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
>>> index 1b84d55..d428392 100644
>>> --- a/drivers/ata/libata-scsi.c
>>> +++ b/drivers/ata/libata-scsi.c
>>> @@ -2859,6 +2859,12 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
>>>    		goto invalid_fld;
>>>    	}
>>>    
>>> +	/* if T_LENGTH is zero (No data is transferred), then dir should be DMA_NONE */
>>> +	if ((cdb[2 + cdb_offset] & 3) == 0 && scmd->sc_data_direction != DMA_NONE) {
>>> +		fp = 2 + cdb_offset;
>>> +		goto invalid_fld;
>>> +	}
>>> +
>>>    	if (ata_is_ncq(tf->protocol) && (cdb[2 + cdb_offset] & 0x3) == 0)

cdb[2 + cdb_offset] & 3) is used again for the ncq test, so you can group things:

	if (!(cdb[2 + cdb_offset] & 0x3)) {
		/*
		 * When T_LENGTH is zero (no data is transferred),
		 * then dir should be DMA_NONE.
		 */
		if (scmd->sc_data_direction != DMA_NONE) {
			fp = 2 + cdb_offset;
			goto invalid_fld;
		}

		if (ata_is_ncq(tf->protocol))
			tf->protocol = ATA_PROT_NCQ_NODATA;
	}

>>>    		tf->protocol = ATA_PROT_NCQ_NODATA;
>>>    
>>> -- 1.8.3.1
>>>
>>
> 


-- 
Damien Le Moal
Western Digital Research