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

Commit d2d055a5 authored by Michael Chan's avatar Michael Chan Committed by Greg Kroah-Hartman
Browse files

bnxt_en: Improve RX consumer index validity check. 



[ Upstream commit a1b0e4e684e9c300b9e759b46cb7a0147e61ddff ]

There is logic to check that the RX/TPA consumer index is the expected
index to work around a hardware problem.  However, the potentially bad
consumer index is first used to index into an array to reference an entry.
This can potentially crash if the bad consumer index is beyond legal
range.  Improve the logic to use the consumer index for dereferencing
after the validity check and log an error message.

Fixes: fa7e2812 ("bnxt_en: Add workaround to detect bad opaque in rx completion (part 2)")
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a333fcc4

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+7 −3
Original line number Diff line number Diff line
@@ -1092,6 +1092,8 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, 
	tpa_info = &rxr->rx_tpa[agg_id];



	if (unlikely(cons != rxr->rx_next_cons)) {

		netdev_warn(bp->dev, "TPA cons %x != expected cons %x\n",

			    cons, rxr->rx_next_cons);

		bnxt_sched_reset(bp, rxr);

		return;

	}
@@ -1544,15 +1546,17 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_napi *bnapi, u32 *raw_cons, 
	}



	cons = rxcmp->rx_cmp_opaque;

	rx_buf = &rxr->rx_buf_ring[cons];

	data = rx_buf->data;

	data_ptr = rx_buf->data_ptr;

	if (unlikely(cons != rxr->rx_next_cons)) {

		int rc1 = bnxt_discard_rx(bp, bnapi, raw_cons, rxcmp);



		netdev_warn(bp->dev, "RX cons %x != expected cons %x\n",

			    cons, rxr->rx_next_cons);

		bnxt_sched_reset(bp, rxr);

		return rc1;

	}

	rx_buf = &rxr->rx_buf_ring[cons];

	data = rx_buf->data;

	data_ptr = rx_buf->data_ptr;

	prefetch(data_ptr);



	misc = le32_to_cpu(rxcmp->rx_cmp_misc_v1);