Commit 3f61cd87 authored Feb 06, 2012 by Jesper Juhl Committed by David S. Miller Feb 07, 2012

bnx2x: Fix mem leak in bnx2x_tpa_stop() if build_skb() fails.



We allocate memory for 'new_data' with kmalloc(). If we get the memory
we then try to build_skb() and if that should fail (which it can) we
do not enter 'if (likely(skb)) {' and actually use 'new_data' but
instead fall through to the 'drop:' label and end up returning from
the function without ever assigning 'new'data' to anything or freeing
it. That leaks the memory allocated to 'new_data'.

This patch fixes the memory leak by doing a kfree(new_data) in the
case where build_skb() fails (or where allocation of 'new_data' itself
fails, but in taht case it's just a harmless kfree(NULL)).

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent da091286

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -523,7 +523,6 @@ static void bnx2x_tpa_stop(struct bnx2x bp, struct bnx2x_fastpath fp,
		skb = build_skb(data);

		if (likely(skb)) {

		#ifdef BNX2X_STOP_ON_ERROR
		if (pad + len > fp->rx_buf_size) {
		BNX2X_ERR("skb_put is about to fail... "
		@@ -557,7 +556,7 @@ static void bnx2x_tpa_stop(struct bnx2x bp, struct bnx2x_fastpath fp,

		return;
		}

		kfree(new_data);
		drop:
		/* drop the packet and keep the buffer in the bin */
		DP(NETIF_MSG_RX_STATUS,