Unverified Commit 01b0e490 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10594 fix CVE-2024-41046 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YZFHBKKS74NKNPCP6KGXLXWG7PCLXDWI/ 
Fix CVE-2024-41046.

Aleksander Jan Bajkowski (2):
  net: lantiq_etop: add blank line after declaration
  net: ethernet: lantiq_etop: fix double free in detach


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IAGEKE 
 
Link:https://gitee.com/openeuler/kernel/pulls/10594

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents d13f2eac 2a19dd70

drivers/net/ethernet/lantiq_etop.c

+3 −2
Original line number Diff line number Diff line
@@ -213,8 +213,9 @@ ltq_etop_free_channel(struct net_device *dev, struct ltq_etop_chan *ch) 
	if (ch->dma.irq)

		free_irq(ch->dma.irq, priv);

	if (IS_RX(ch->idx)) {

		int desc;

		for (desc = 0; desc < LTQ_DESC_NUM; desc++)

		struct ltq_dma_channel *dma = &ch->dma;



		for (dma->desc = 0; dma->desc < LTQ_DESC_NUM; dma->desc++)

			dev_kfree_skb_any(ch->skb[ch->dma.desc]);

	}

}