Unverified Commit 986fcc8f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9624 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/O7OPVQTCZABXGD5RPX5X4ODSKJVNF4TP/ 
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/9624

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 41eb07a8 9296de3b

drivers/net/ethernet/freescale/fec_main.c

+0 −26
Original line number Diff line number Diff line
@@ -3657,29 +3657,6 @@ fec_set_mac_address(struct net_device *ndev, void *p) 
	return 0;

}



#ifdef CONFIG_NET_POLL_CONTROLLER

/**

 * fec_poll_controller - FEC Poll controller function

 * @dev: The FEC network adapter

 *

 * Polled functionality used by netconsole and others in non interrupt mode

 *

 */

static void fec_poll_controller(struct net_device *dev)

{

	int i;

	struct fec_enet_private *fep = netdev_priv(dev);



	for (i = 0; i < FEC_IRQ_NUM; i++) {

		if (fep->irq[i] > 0) {

			disable_irq(fep->irq[i]);

			fec_enet_interrupt(fep->irq[i], dev);

			enable_irq(fep->irq[i]);

		}

	}

}

#endif



static inline void fec_enet_set_netdev_features(struct net_device *netdev,

	netdev_features_t features)

{
@@ -3986,9 +3963,6 @@ static const struct net_device_ops fec_netdev_ops = { 
	.ndo_tx_timeout		= fec_timeout,

	.ndo_set_mac_address	= fec_set_mac_address,

	.ndo_eth_ioctl		= phy_do_ioctl_running,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= fec_poll_controller,

#endif

	.ndo_set_features	= fec_set_features,

	.ndo_bpf		= fec_enet_bpf,

	.ndo_xdp_xmit		= fec_enet_xdp_xmit,

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);
@@ -2839,9 +2828,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)