Unverified Commit 906ec11a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9559 CVE-2024-38597 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Chuang <liuchuang40@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CDJK5G2XEBD44WTAN3WACPRDUEBNK3SO/ 
Fixing CVE-2024-38597

Jakub Kicinski (1):
  eth: sungem: remove .ndo_poll_controller to avoid deadlocks

Wei Fang (1):
  net: fec: remove .ndo_poll_controller to avoid deadlocks


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IA6S6S 
 
Link:https://gitee.com/openeuler/kernel/pulls/9559

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents a797cbe4 ed7e5a4a

drivers/net/ethernet/sun/sungem.c

+0 −14
Original line number Diff line number Diff line
@@ -949,17 +949,6 @@ static irqreturn_t gem_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



#ifdef CONFIG_NET_POLL_CONTROLLER

static void gem_poll_controller(struct net_device *dev)

{

	struct gem *gp = netdev_priv(dev);



	disable_irq(gp->pdev->irq);

	gem_interrupt(gp->pdev->irq, dev);

	enable_irq(gp->pdev->irq);

}

#endif



static void gem_tx_timeout(struct net_device *dev, unsigned int txqueue)

{

	struct gem *gp = netdev_priv(dev);
@@ -2836,9 +2825,6 @@ static const struct net_device_ops gem_netdev_ops = { 
	.ndo_change_mtu		= gem_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address    = gem_set_mac_address,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller    = gem_poll_controller,

#endif

};



static int gem_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)