From: George Kennedy <george.kennedy@oracle.com>
To: damien.lemoal@opensource.wdc.com
Cc: linux-ide@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
"GEORGE.KENNEDY" <george.kennedy@oracle.com>
Subject: [PATCH RESEND 2] libata: if T_LENGTH is zero, dma direction should be DMA_NONE
Date: Mon, 13 Dec 2021 10:33:51 -0500 [thread overview]
Message-ID: <1f57bc3d-d125-7e09-4699-0338ddcc50f1@oracle.com> (raw)
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
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)
tf->protocol = ATA_PROT_NCQ_NODATA;
-- 1.8.3.1
next reply other threads:[~2021-12-13 15:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 15:33 George Kennedy [this message]
2021-12-13 21:37 ` [PATCH RESEND 2] libata: if T_LENGTH is zero, dma direction should be DMA_NONE Damien Le Moal
2021-12-13 22:15 ` George Kennedy
2021-12-13 23:50 ` Damien Le Moal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1f57bc3d-d125-7e09-4699-0338ddcc50f1@oracle.com \
--to=george.kennedy@oracle.com \
--cc=damien.lemoal@opensource.wdc.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox