]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
misc: alcor_pci: fix null-ptr-deref when there is no PCI bridge
authorTong Zhang <ztong0001@gmail.com>
Thu, 13 May 2021 04:07:33 +0000 (00:07 -0400)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 20 Sep 2021 13:39:41 +0000 (15:39 +0200)
commit0143a45362f208c6ae85eb66f9aa0b828edf5b84
tree97c4260d1987efc940885f23146f6fc6cc9e389a
parent54a4f02bdfe6ed591386560d31612a1a35d15cf6
misc: alcor_pci: fix null-ptr-deref when there is no PCI bridge

BugLink: https://bugs.launchpad.net/bugs/1939738
[ Upstream commit 3ce3e45cc333da707d4d6eb433574b990bcc26f5 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/misc/cardreader/alcor_pci.c