Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cff08d63 authored by Michael Ellerman's avatar Michael Ellerman Committed by Greg Kroah-Hartman
Browse files

ata: pata_macio: Use WARN instead of BUG 



[ Upstream commit d4bc0a264fb482b019c84fbc7202dd3cab059087 ]

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: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d2a79494

drivers/ata/pata_macio.c

+5 −2
Original line number Diff line number Diff line
@@ -537,7 +537,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_SYSTEM;



			len = (sg_len < MAX_DBDMA_SEG) ? sg_len : MAX_DBDMA_SEG;

			table->command = cpu_to_le16(write ? OUTPUT_MORE: INPUT_MORE);
@@ -549,11 +550,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_SYSTEM;



	/* Convert the last command to an input/output */

	table--;