Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <gregkh@linuxfoundation.org>
Signed-off-by: Tong Zhang <ztong0001@gmail.com>
Link: https://lore.kernel.org/r/20210513040732.1310159-1-ztong0001@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Tong Zhang and committed by
Greg Kroah-Hartman
3ce3e45c 7272b591

+7 -1
+7 -1
drivers/misc/cardreader/alcor_pci.c
··· 139 139 u32 val32; 140 140 141 141 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, 143 149 priv->parent_pdev); 144 150 145 151 if ((priv->pdev_cap_off == 0) || (priv->parent_cap_off == 0)) {