OSDN Git Service

net: txgbe: Avoid passing uninitialised parameter to pci_wake_from_d3()
authorSimon Horman <horms@kernel.org>
Tue, 6 Jun 2023 13:49:45 +0000 (15:49 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Jun 2023 11:28:58 +0000 (12:28 +0100)
txgbe_shutdown() relies on txgbe_dev_shutdown() to initialise
wake by passing it by reference. However, txgbe_dev_shutdown()
doesn't use this parameter at all.

wake is then passed uninitialised by txgbe_dev_shutdown()
to pci_wake_from_d3().

Resolve this problem by:
* Removing the unused parameter from txgbe_dev_shutdown()
* Removing the uninitialised variable wake from txgbe_dev_shutdown()
* Passing false to pci_wake_from_d3() - this assumes that
  although uninitialised wake was in practice false (0).

I'm not sure that this counts as a bug, as I'm not sure that
it manifests in any unwanted behaviour. But in any case, the issue
was introduced by:

  3ce7547e5b71 ("net: txgbe: Add build support for txgbe")

Flagged by Smatch as:

  .../txgbe_main.c:486 txgbe_shutdown() error: uninitialized symbol 'wake'.

No functional change intended.
Compile tested only.

Signed-off-by: Simon Horman <horms@kernel.org>
Reviewed-by: Jiawen Wu <jiawenwu@trustnetic.com>
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/wangxun/txgbe/txgbe_main.c

index 0f0d9fa..cfe47f3 100644 (file)
@@ -457,7 +457,7 @@ static int txgbe_close(struct net_device *netdev)
        return 0;
 }
 
-static void txgbe_dev_shutdown(struct pci_dev *pdev, bool *enable_wake)
+static void txgbe_dev_shutdown(struct pci_dev *pdev)
 {
        struct wx *wx = pci_get_drvdata(pdev);
        struct net_device *netdev;
@@ -477,12 +477,10 @@ static void txgbe_dev_shutdown(struct pci_dev *pdev, bool *enable_wake)
 
 static void txgbe_shutdown(struct pci_dev *pdev)
 {
-       bool wake;
-
-       txgbe_dev_shutdown(pdev, &wake);
+       txgbe_dev_shutdown(pdev);
 
        if (system_state == SYSTEM_POWER_OFF) {
-               pci_wake_from_d3(pdev, wake);
+               pci_wake_from_d3(pdev, false);
                pci_set_power_state(pdev, PCI_D3hot);
        }
 }