]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
If dmi_get_system_info() returns NULL, pch_phub_probe() will dereferencea
authorAlexander Stein <alexander.stein@systec-electronic.com>
Sat, 16 Jul 2011 13:30:42 +0000 (23:30 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 05:04:39 +0000 (15:04 +1000)
a zero pointer.

This oops was observed on an Atom based board which has no BIOS, but a
bootloder which doesn't privde DMI data.

Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
Cc: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Cc: Greg KH <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/misc/pch_phub.c

index d06cf2f47742046ec5f8da875f21d718811729b2..0fd7e77bee297d1da1d877cfe8af2146644ef74c 100644 (file)
@@ -686,6 +686,8 @@ static int __devinit pch_phub_probe(struct pci_dev *pdev,
        }
 
        if (id->driver_data == 1) { /* EG20T PCH */
+               const char *board_name;
+
                retval = sysfs_create_file(&pdev->dev.kobj,
                                           &dev_attr_pch_mac.attr);
                if (retval)
@@ -701,7 +703,8 @@ static int __devinit pch_phub_probe(struct pci_dev *pdev,
                                               CLKCFG_CANCLK_MASK);
 
                /* quirk for CM-iTC board */
-               if (strstr(dmi_get_system_info(DMI_BOARD_NAME), "CM-iTC"))
+               board_name = dmi_get_system_info(DMI_BOARD_NAME);
+               if (board_name && strstr(board_name, "CM-iTC"))
                        pch_phub_read_modify_write_reg(chip,
                                                (unsigned int)CLKCFG_REG_OFFSET,
                                                CLKCFG_UART_48MHZ | CLKCFG_BAUDDIV |