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

Commit bfadcbf5 authored by Wang Hai's avatar Wang Hai Committed by Greg Kroah-Hartman
Browse files

net: pch_gbe: fix potential memleak in pch_gbe_tx_queue() 



[ Upstream commit 2360f9b8c4e81d242d4cbf99d630a2fffa681fab ]

In pch_gbe_xmit_frame(), NETDEV_TX_OK will be returned whether
pch_gbe_tx_queue() sends data successfully or not, so pch_gbe_tx_queue()
needs to free skb before returning. But pch_gbe_tx_queue() returns without
freeing skb in case of dma_map_single() fails. Add dev_kfree_skb_any()
to fix it.

Fixes: 77555ee7 ("net: Add Gigabit Ethernet driver of Topcliff PCH")
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e00b42cb

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1166,6 +1166,7 @@ static void pch_gbe_tx_queue(struct pch_gbe_adapter *adapter, 
		buffer_info->dma = 0;

		buffer_info->time_stamp = 0;

		tx_ring->next_to_use = ring_num;

		dev_kfree_skb_any(skb);

		return;

	}

	buffer_info->mapped = true;