Commit b0b1210b authored by Geoff Levand's avatar Geoff Levand Committed by David S. Miller
Browse files

ps3/gelic: Fix SKB allocation 



Commit 3ce4f9c3 ("net/ps3_gelic_net: Add gelic_descr structures") of
6.8-rc1 had a copy-and-paste error where the pointer that holds the
allocated SKB (struct gelic_descr.skb)  was set to NULL after the SKB was
allocated. This resulted in a kernel panic when the SKB pointer was
accessed.

This fix moves the initialization of the gelic_descr to before the SKB
is allocated.

Reported-by: default avatarsambat goson <sombat3960@gmail.com>
Fixes: 3ce4f9c3 ("net/ps3_gelic_net: Add gelic_descr structures")
Signed-off-by: default avatarGeoff Levand <geoff@infradead.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 734f06db

drivers/net/ethernet/toshiba/ps3_gelic_net.c

+6 −6
Original line number Diff line number Diff line
@@ -384,18 +384,18 @@ static int gelic_descr_prepare_rx(struct gelic_card *card, 
	if (gelic_descr_get_status(descr) !=  GELIC_DESCR_DMA_NOT_IN_USE)

		dev_info(ctodev(card), "%s: ERROR status\n", __func__);



	descr->skb = netdev_alloc_skb(*card->netdev, rx_skb_size);

	if (!descr->skb) {

		descr->hw_regs.payload.dev_addr = 0; /* tell DMAC don't touch memory */

		return -ENOMEM;

	}

	descr->hw_regs.dmac_cmd_status = 0;

	descr->hw_regs.result_size = 0;

	descr->hw_regs.valid_size = 0;

	descr->hw_regs.data_error = 0;

	descr->hw_regs.payload.dev_addr = 0;

	descr->hw_regs.payload.size = 0;

	descr->skb = NULL;



	descr->skb = netdev_alloc_skb(*card->netdev, rx_skb_size);

	if (!descr->skb) {

		descr->hw_regs.payload.dev_addr = 0; /* tell DMAC don't touch memory */

		return -ENOMEM;

	}



	offset = ((unsigned long)descr->skb->data) &

		(GELIC_NET_RXBUF_ALIGN - 1);