]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: ethernet: fix potential use-after-free in ec_bhf_remove
authorPavel Skripkin <paskripkin@gmail.com>
Fri, 18 Jun 2021 13:49:02 +0000 (16:49 +0300)
committerSasha Levin <sashal@kernel.org>
Wed, 30 Jun 2021 12:49:34 +0000 (08:49 -0400)
[ Upstream commit 9cca0c2d70149160407bda9a9446ce0c29b6e6c6 ]

static void ec_bhf_remove(struct pci_dev *dev)
{
...
struct ec_bhf_priv *priv = netdev_priv(net_dev);

unregister_netdev(net_dev);
free_netdev(net_dev);

pci_iounmap(dev, priv->dma_io);
pci_iounmap(dev, priv->io);
...
}

priv is netdev private data, but it is used
after free_netdev(). It can cause use-after-free when accessing priv
pointer. So, fix it by moving free_netdev() after pci_iounmap()
calls.

Fixes: 6af55ff52b02 ("Driver for Beckhoff CX5020 EtherCAT master module.")
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/ec_bhf.c

index f7b42483921c5847a883a286d28f7700e10b1d28..0ade0c6d81ee369302d040c59278d1fc6a3470bd 100644 (file)
@@ -589,10 +589,12 @@ static void ec_bhf_remove(struct pci_dev *dev)
        struct ec_bhf_priv *priv = netdev_priv(net_dev);
 
        unregister_netdev(net_dev);
-       free_netdev(net_dev);
 
        pci_iounmap(dev, priv->dma_io);
        pci_iounmap(dev, priv->io);
+
+       free_netdev(net_dev);
+
        pci_release_regions(dev);
        pci_clear_master(dev);
        pci_disable_device(dev);