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

Commit 451bff29 authored by Lubomir Rintel's avatar Lubomir Rintel Committed by David S. Miller
Browse files

pxa168_eth: Allocate receive queue initialized to zero 



Zero pointer in rx_skb or tx_skb is how respective *_deinit() functions find
out that a skb slot is unallocated. If *_init() functions unsuccessfully return
after the allocation (e.g. when subsequent dma_alloc_coherent() is not
successful), this would result in attempt to kfree() invalid pointers.

Signed-off-by: default avatarLubomir Rintel <lkundrak@v3.sk>
Cc: Kosta Zertsekel <konszert@marvell.com>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 776fbcc9

drivers/net/ethernet/marvell/pxa168_eth.c

+2 −2
Original line number Diff line number Diff line
@@ -1015,7 +1015,7 @@ static int rxq_init(struct net_device *dev) 
	int rx_desc_num = pep->rx_ring_size;



	/* Allocate RX skb rings */

	pep->rx_skb = kmalloc(sizeof(*pep->rx_skb) * pep->rx_ring_size,

	pep->rx_skb = kzalloc(sizeof(*pep->rx_skb) * pep->rx_ring_size,

			     GFP_KERNEL);

	if (!pep->rx_skb)

		return -ENOMEM;
@@ -1076,7 +1076,7 @@ static int txq_init(struct net_device *dev) 
	int size = 0, i = 0;

	int tx_desc_num = pep->tx_ring_size;



	pep->tx_skb = kmalloc(sizeof(*pep->tx_skb) * pep->tx_ring_size,

	pep->tx_skb = kzalloc(sizeof(*pep->tx_skb) * pep->tx_ring_size,

			     GFP_KERNEL);

	if (!pep->tx_skb)

		return -ENOMEM;