linux-kernel - [RFC PATCH] ata: pata_macio: Use WARN instead of BUG

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: <20240819101913.489513-1-mpe@ellerman.id.au>
Date: Mon, 19 Aug 2024 20:19:13 +1000
From: Michael Ellerman <mpe@...erman.id.au>
To: cassel@...nel.org
Cc: dlemoal@...nel.org,
	linux-ide@...r.kernel.org,
	<linux-kernel@...r.kernel.org>,
	<linuxppc-dev@...ts.ozlabs.org>,
	<hch@....de>,
	linux-ppc@...la.no,
	vidra@...l.mff.cuni.cz
Subject: [RFC PATCH] ata: pata_macio: Use WARN instead of BUG

The overflow/underflow conditions in pata_macio_qc_prep() should never
happen. But if they do there's no need to kill the system entirely, a
WARN and failing the IO request should be sufficient and might allow the
system to keep running.

Signed-off-by: Michael Ellerman <mpe@...erman.id.au>
---
 drivers/ata/pata_macio.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Not sure if AC_ERR_OTHER is the right error code to use?

diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index eaffa510de49..552e3ac0d391 100644
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -554,7 +554,8 @@ static enum ata_completion_errors pata_macio_qc_prep(struct ata_queued_cmd *qc)
 
 		while (sg_len) {
 			/* table overflow should never happen */
-			BUG_ON (pi++ >= MAX_DCMDS);
+			if (WARN_ON_ONCE(pi >= MAX_DCMDS))
+				return AC_ERR_OTHER;
 
 			len = (sg_len < MAX_DBDMA_SEG) ? sg_len : MAX_DBDMA_SEG;
 			table->command = cpu_to_le16(write ? OUTPUT_MORE: INPUT_MORE);
@@ -566,11 +567,13 @@ static enum ata_completion_errors pata_macio_qc_prep(struct ata_queued_cmd *qc)
 			addr += len;
 			sg_len -= len;
 			++table;
+			++pi;
 		}
 	}
 
 	/* Should never happen according to Tejun */
-	BUG_ON(!pi);
+	if (WARN_ON_ONCE(!pi))
+		return AC_ERR_OTHER;
 
 	/* Convert the last command to an input/output */
 	table--;
-- 
2.46.0