Commit c7e334f3 authored by Igor Pylypiv's avatar Igor Pylypiv Committed by xia-bing1
Browse files

ata: libata-core: Set ATA_QCFLAG_RTF_FILLED in fill_result_tf() 

mainline inclusion
from mainline-v6.11-rc1
commit 18676c6aab0863618eb35443e7b8615eea3535a9
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB9L88
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/commit/?id=18676c6aab0863618eb35443e7b8615eea3535a9



---------------------------------------------------------------------

ATA_QCFLAG_RTF_FILLED is not specific to ahci and can be used generally
to check if qc->result_tf contains valid data.

Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarNiklas Cassel <cassel@kernel.org>
Signed-off-by: default avatarIgor Pylypiv <ipylypiv@google.com>
Link: https://lore.kernel.org/r/20240702024735.1152293-7-ipylypiv@google.com


Signed-off-by: default avatarNiklas Cassel <cassel@kernel.org>
Signed-off-by: default avatarBing Xia <xiabing12@h-partners.com>
parent f0c88450

drivers/ata/libahci.c

+2 −10
Original line number Diff line number Diff line
@@ -2088,13 +2088,6 @@ static void ahci_qc_fill_rtf(struct ata_queued_cmd *qc) 
	struct ahci_port_priv *pp = qc->ap->private_data;

	u8 *rx_fis = pp->rx_fis;



	/*

	 * rtf may already be filled (e.g. for successful NCQ commands).

	 * If that is the case, we have nothing to do.

	 */

	if (qc->flags & ATA_QCFLAG_RTF_FILLED)

		return;



	if (pp->fbs_enabled)

		rx_fis += qc->dev->link->pmp * AHCI_RX_FIS_SZ;
@@ -2108,7 +2101,6 @@ static void ahci_qc_fill_rtf(struct ata_queued_cmd *qc) 
	    !(qc->flags & ATA_QCFLAG_EH)) {

		ata_tf_from_fis(rx_fis + RX_FIS_PIO_SETUP, &qc->result_tf);

		qc->result_tf.status = (rx_fis + RX_FIS_PIO_SETUP)[15];

		qc->flags |= ATA_QCFLAG_RTF_FILLED;

		return;

	}
@@ -2131,12 +2123,10 @@ static void ahci_qc_fill_rtf(struct ata_queued_cmd *qc) 
		 */

		qc->result_tf.status = fis[2];

		qc->result_tf.error = fis[3];

		qc->flags |= ATA_QCFLAG_RTF_FILLED;

		return;

	}



	ata_tf_from_fis(rx_fis + RX_FIS_D2H_REG, &qc->result_tf);

	qc->flags |= ATA_QCFLAG_RTF_FILLED;

}



static void ahci_qc_ncq_fill_rtf(struct ata_port *ap, u64 done_mask)
@@ -2171,6 +2161,7 @@ static void ahci_qc_ncq_fill_rtf(struct ata_port *ap, u64 done_mask) 
			if (qc && ata_is_ncq(qc->tf.protocol)) {

				qc->result_tf.status = status;

				qc->result_tf.error = error;

				qc->result_tf.flags = qc->tf.flags;

				qc->flags |= ATA_QCFLAG_RTF_FILLED;

			}

			done_mask &= ~(1ULL << tag);
@@ -2195,6 +2186,7 @@ static void ahci_qc_ncq_fill_rtf(struct ata_port *ap, u64 done_mask) 
			fis += RX_FIS_SDB;

			qc->result_tf.status = fis[2];

			qc->result_tf.error = fis[3];

			qc->result_tf.flags = qc->tf.flags;

			qc->flags |= ATA_QCFLAG_RTF_FILLED;

		}

		done_mask &= ~(1ULL << tag);

drivers/ata/libata-core.c

+8 −0
Original line number Diff line number Diff line
@@ -4792,8 +4792,16 @@ static void fill_result_tf(struct ata_queued_cmd *qc) 
{

	struct ata_port *ap = qc->ap;



	/*

	 * rtf may already be filled (e.g. for successful NCQ commands).

	 * If that is the case, we have nothing to do.

	 */

	if (qc->flags & ATA_QCFLAG_RTF_FILLED)

		return;



	qc->result_tf.flags = qc->tf.flags;

	ap->ops->qc_fill_rtf(qc);

	qc->flags |= ATA_QCFLAG_RTF_FILLED;

}



static void ata_verify_xfer(struct ata_queued_cmd *qc)