Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ac0ce85 authored by Jesper Juhl's avatar Jesper Juhl Committed by Greg Kroah-Hartman
Browse files

PCI: Be a bit defensive in quirk_nvidia_ck804() so we don't risk dereferencing a NULL pdev. 



pci_get_slot() may return NULL if nothing was found.  quirk_nvidia_ck804()
does not check the value returned from pci_get_slot(), so it may end up
causing a NULL pointer deref.

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1597cacb

drivers/pci/quirks.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1743,6 +1743,8 @@ static void __devinit quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev) 
	 * a single one having MSI is enough to be sure that MSI are supported.

	 * a single one having MSI is enough to be sure that MSI are supported.

	 */

	 */

	pdev = pci_get_slot(dev->bus, 0);

	pdev = pci_get_slot(dev->bus, 0);

	if (!pdev)

		return;

	if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) {

	if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) {

		printk(KERN_WARNING "PCI: MSI quirk detected. "

		printk(KERN_WARNING "PCI: MSI quirk detected. "

		       "MSI disabled on chipset %s.\n",

		       "MSI disabled on chipset %s.\n",