Skip to content

Commit 3ce3e45

Browse files
lztogregkh
authored andcommitted
misc: alcor_pci: fix null-ptr-deref when there is no PCI bridge
There is an issue with the ASPM(optional) capability checking function. A device might be attached to root complex directly, in this case, bus->self(bridge) will be NULL, thus priv->parent_pdev is NULL. Since alcor_pci_init_check_aspm(priv->parent_pdev) checks the PCI link's ASPM capability and populate parent_cap_off, which will be used later by alcor_pci_aspm_ctrl() to dynamically turn on/off device, what we can do here is to avoid checking the capability if we are on the root complex. This will make pdev_cap_off 0 and alcor_pci_aspm_ctrl() will simply return when bring called, effectively disable ASPM for the device. [ 1.246492] BUG: kernel NULL pointer dereference, address: 00000000000000c0 [ 1.248731] RIP: 0010:pci_read_config_byte+0x5/0x40 [ 1.253998] Call Trace: [ 1.254131] ? alcor_pci_find_cap_offset.isra.0+0x3a/0x100 [alcor_pci] [ 1.254476] alcor_pci_probe+0x169/0x2d5 [alcor_pci] Co-developed-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Tong Zhang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 7272b59 commit 3ce3e45

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/misc/cardreader/alcor_pci.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,13 @@ static void alcor_pci_init_check_aspm(struct alcor_pci_priv *priv)
139139
u32 val32;
140140

141141
priv->pdev_cap_off = alcor_pci_find_cap_offset(priv, priv->pdev);
142-
priv->parent_cap_off = alcor_pci_find_cap_offset(priv,
142+
/*
143+
* A device might be attached to root complex directly and
144+
* priv->parent_pdev will be NULL. In this case we don't check its
145+
* capability and disable ASPM completely.
146+
*/
147+
if (!priv->parent_pdev)
148+
priv->parent_cap_off = alcor_pci_find_cap_offset(priv,
143149
priv->parent_pdev);
144150

145151
if ((priv->pdev_cap_off == 0) || (priv->parent_cap_off == 0)) {

0 commit comments

Comments
 (0)