diff mbox

bnx2x: fix possible panic under memory stress

Message ID 1403768642.374.5.camel@edumazet-glaptop2.roam.corp.google.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Eric Dumazet June 26, 2014, 7:44 a.m. UTC 
From: Eric Dumazet <edumazet@google.com>

While it is legal to kfree(NULL), it is not wise to use :
put_page(virt_to_head_page(NULL))

 BUG: unable to handle kernel paging request at ffffeba400000000
 IP: [<ffffffffc01f5928>] virt_to_head_page+0x36/0x44 [bnx2x]

Reported-by: Michel Lespinasse <walken@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Ariel Elior <ariel.elior@qlogic.com>
Fixes: d46d132cc021 ("bnx2x: use netdev_alloc_frag()")
---
This is a stable candidate, bug added in linux-3.8

 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller July 1, 2014, 7:20 p.m. UTC | #1 
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 26 Jun 2014 00:44:02 -0700

> From: Eric Dumazet <edumazet@google.com>
> 
> While it is legal to kfree(NULL), it is not wise to use :
> put_page(virt_to_head_page(NULL))
> 
>  BUG: unable to handle kernel paging request at ffffeba400000000
>  IP: [<ffffffffc01f5928>] virt_to_head_page+0x36/0x44 [bnx2x]
> 
> Reported-by: Michel Lespinasse <walken@google.com>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Ariel Elior <ariel.elior@qlogic.com>
> Fixes: d46d132cc021 ("bnx2x: use netdev_alloc_frag()")
> ---
> This is a stable candidate, bug added in linux-3.8

Applied and queued up for -stable, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 47c5814114e1..4b875da1c7ed 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -797,7 +797,8 @@  static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
 
 		return;
 	}
-	bnx2x_frag_free(fp, new_data);
+	if (new_data)
+		bnx2x_frag_free(fp, new_data);
 drop:
 	/* drop the packet and keep the buffer in the bin */
 	DP(NETIF_MSG_RX_STATUS,