Message ID | 1388997834-28028-1-git-send-email-tangchen@cn.fujitsu.com (mailing list archive) |
---|---|
State | Accepted, archived |
Headers | show |
On Monday, January 06, 2014 04:43:54 PM Tang Chen wrote: > strncmp() does not check if the params are NULL. In acpi_table_parse(), > if @id is NULL, the kernel will panic. > > Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com> > Acked-by: Toshi Kani <toshi.kani@hp.com> Queued up for 3.14 (but please use the e-mail address from MAINTAINERS next time). Thanks! > --- > drivers/acpi/tables.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c > index d67a1fe..5a5263b 100644 > --- a/drivers/acpi/tables.c > +++ b/drivers/acpi/tables.c > @@ -293,7 +293,7 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler) > if (acpi_disabled) > return -ENODEV; > > - if (!handler) > + if (!id || !handler) > return -EINVAL; > > if (strncmp(id, ACPI_SIG_MADT, 4) == 0) >
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index d67a1fe..5a5263b 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -293,7 +293,7 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler) if (acpi_disabled) return -ENODEV; - if (!handler) + if (!id || !handler) return -EINVAL; if (strncmp(id, ACPI_SIG_MADT, 4) == 0)