* [PATCH] pch_phub: Don't panic if dmi_get_system_info returns NULL
@ 2011-06-01 6:44 Alexander Stein
2011-06-16 7:05 ` [PATCH v2] pch_phub: Don't oops " Alexander Stein
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Stein @ 2011-06-01 6:44 UTC (permalink / raw)
To: linux-kernel; +Cc: Alexander Stein
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
---
drivers/misc/pch_phub.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c
index 5fe79df..01eb67b 100644
--- a/drivers/misc/pch_phub.c
+++ b/drivers/misc/pch_phub.c
@@ -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 |
--
1.7.3.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v2] pch_phub: Don't oops if dmi_get_system_info returns NULL
2011-06-01 6:44 [PATCH] pch_phub: Don't panic if dmi_get_system_info returns NULL Alexander Stein
@ 2011-06-16 7:05 ` Alexander Stein
2011-06-16 14:34 ` [stable] " Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Stein @ 2011-06-16 7:05 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: stable, linux-kernel, Tomoya MORINAGA, Andrew Morton,
Alexander Stein
If dmi_get_system_info() returns NULL, pch_phub_probe() will
dereferencea 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>
---
Changes in v2:
* Adjust summary
* Commit message is more verbose
drivers/misc/pch_phub.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c
index 5fe79df..01eb67b 100644
--- a/drivers/misc/pch_phub.c
+++ b/drivers/misc/pch_phub.c
@@ -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 |
--
1.7.3.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [stable] [PATCH v2] pch_phub: Don't oops if dmi_get_system_info returns NULL
2011-06-16 7:05 ` [PATCH v2] pch_phub: Don't oops " Alexander Stein
@ 2011-06-16 14:34 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2011-06-16 14:34 UTC (permalink / raw)
To: Alexander Stein
Cc: Greg Kroah-Hartman, Tomoya MORINAGA, Andrew Morton, stable,
linux-kernel
On Thu, Jun 16, 2011 at 09:05:24AM +0200, Alexander Stein wrote:
> If dmi_get_system_info() returns NULL, pch_phub_probe() will
> dereferencea 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>
> ---
> Changes in v2:
> * Adjust summary
> * Commit message is more verbose
>
> drivers/misc/pch_phub.c | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
<formletter>
This is not the correct way to submit patches for inclusion in the
stable kernel tree. Please read Documentation/stable_kernel_rules.txt
for how to do this properly.
</formletter>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-06-16 14:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-01 6:44 [PATCH] pch_phub: Don't panic if dmi_get_system_info returns NULL Alexander Stein
2011-06-16 7:05 ` [PATCH v2] pch_phub: Don't oops " Alexander Stein
2011-06-16 14:34 ` [stable] " Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox