diff mbox

[net] bnxt_en: Fix "uninitialized variable" bug in TPA code path.

Message ID 1484708839-11745-1-git-send-email-michael.chan@broadcom.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Michael Chan Jan. 18, 2017, 3:07 a.m. UTC 
In the TPA GRO code path, initialize the tcp_opt_len variable to 0 so
that it will be correct for packets without TCP timestamps.  The bug
caused the SKB fields to be incorrectly set up for packets without
TCP timestamps, leading to these packets being rejected by the stack.

Reported-by: Andy Gospodarek <andrew.gospodarek@broadocm.com>
Acked-by: Andy Gospodarek <andrew.gospodarek@broadocm.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Miller Jan. 18, 2017, 10:02 p.m. UTC | #1 
From: Michael Chan <michael.chan@broadcom.com>
Date: Tue, 17 Jan 2017 22:07:19 -0500

> In the TPA GRO code path, initialize the tcp_opt_len variable to 0 so
> that it will be correct for packets without TCP timestamps.  The bug
> caused the SKB fields to be incorrectly set up for packets without
> TCP timestamps, leading to these packets being rejected by the stack.
> 
> Reported-by: Andy Gospodarek <andrew.gospodarek@broadocm.com>
> Acked-by: Andy Gospodarek <andrew.gospodarek@broadocm.com>
> Signed-off-by: Michael Chan <michael.chan@broadcom.com>

Applied, thanks Andy.
diff mbox

Patch

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 9608cb4..53e686f 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1099,7 +1099,7 @@  static struct sk_buff *bnxt_gro_func_5730x(struct bnxt_tpa_info *tpa_info,
 {
 #ifdef CONFIG_INET
 	struct tcphdr *th;
-	int len, nw_off, tcp_opt_len;
+	int len, nw_off, tcp_opt_len = 0;
 
 	if (tcp_ts)
 		tcp_opt_len = 12;