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

Commit 0b397b17 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Fix uninitialized variable usage in bnxt_rx_pkt(). 



In bnxt_rx_pkt(), if the driver encounters BD errors, it will recycle
the buffers and jump to the end where the uninitailized variable "len"
is referenced.  Fix it by adding a new jump label that will skip
the length update.  This is the most correct fix since the length
may not be valid when we get this type of error.

Fixes: 6a8788f2 ("bnxt_en: add support for software dynamic interrupt moderation")
Reported-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Cc: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Reviewed-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Tested-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f93cd3f

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

+5 −4
Original line number Diff line number Diff line
@@ -1625,7 +1625,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, 
			netdev_warn(bp->dev, "RX buffer error %x\n", rx_err);

			bnxt_sched_reset(bp, rxr);

		}

		goto next_rx;

		goto next_rx_no_len;

	}



	len = le32_to_cpu(rxcmp->rx_cmp_len_flags_type) >> RX_CMP_LEN_SHIFT;
@@ -1706,12 +1706,13 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, 
	rc = 1;



next_rx:

	rxr->rx_prod = NEXT_RX(prod);

	rxr->rx_next_cons = NEXT_RX(cons);



	cpr->rx_packets += 1;

	cpr->rx_bytes += len;



next_rx_no_len:

	rxr->rx_prod = NEXT_RX(prod);

	rxr->rx_next_cons = NEXT_RX(cons);



next_rx_no_prod_no_len:

	*raw_cons = tmp_raw_cons;