diff options
| author |   Eric Dumazet <edumazet@google.com> | 2014-06-26 00:44:02 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-07-01 12:20:20 -0700 |
| commit | 07b0f00964def8af9321cfd6c4a7e84f6362f728 (patch) | |
| tree | bf5c690b804626166c77aa24ce8ea7dbff29583a /drivers/net | |
| parent | ipv4: irq safe sk_dst_[re]set() and ipv4_sk_update_pmtu() fix (diff) | |
| download | linux-dev-07b0f00964def8af9321cfd6c4a7e84f6362f728.tar.xz linux-dev-07b0f00964def8af9321cfd6c4a7e84f6362f728.zip | |
bnx2x: fix possible panic under memory stress
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()")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 |
1 files changed, 2 insertions, 1 deletions
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, |