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

Commit 2c94e856 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

sh_eth: fix uninitialized arrays in sh_eth_ring_init() 



sh_eth_ring_free()  called in the sh_eth_ring_init()'s error path expects
the arrays pointed  to  by 'sh_eth_private::[rt]x_skbuff' to be initialized
with NULLs but they are allocated with just kmalloc_array() and so are left
filled with random data. Use kcalloc() instead.

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 615a1003

drivers/net/ethernet/renesas/sh_eth.c

+4 −4
Original line number Diff line number Diff line
@@ -1212,15 +1212,15 @@ static int sh_eth_ring_init(struct net_device *ndev) 
		mdp->rx_buf_sz += NET_IP_ALIGN;



	/* Allocate RX and TX skb rings */

	mdp->rx_skbuff = kmalloc_array(mdp->num_rx_ring,

				       sizeof(*mdp->rx_skbuff), GFP_KERNEL);

	mdp->rx_skbuff = kcalloc(mdp->num_rx_ring, sizeof(*mdp->rx_skbuff),

				 GFP_KERNEL);

	if (!mdp->rx_skbuff) {

		ret = -ENOMEM;

		return ret;

	}



	mdp->tx_skbuff = kmalloc_array(mdp->num_tx_ring,

				       sizeof(*mdp->tx_skbuff), GFP_KERNEL);

	mdp->tx_skbuff = kcalloc(mdp->num_tx_ring, sizeof(*mdp->tx_skbuff),

				 GFP_KERNEL);

	if (!mdp->tx_skbuff) {

		ret = -ENOMEM;

		goto skb_ring_free;