From 8de559583aa337b7c65e91647a6a07cdffd5184a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 27 Jun 2014 16:46:25 -0700 Subject: [PATCH] 3.10-stable patches added patches: acpi-fix-conflict-between-customized-dsdt-and-dsdt-local-copy.patch acpica-utstring-check-array-index-bound-before-use.patch --- ...-customized-dsdt-and-dsdt-local-copy.patch | 46 +++++++++++++++++++ ...g-check-array-index-bound-before-use.patch | 33 +++++++++++++ queue-3.10/series | 2 + 3 files changed, 81 insertions(+) create mode 100644 queue-3.10/acpi-fix-conflict-between-customized-dsdt-and-dsdt-local-copy.patch create mode 100644 queue-3.10/acpica-utstring-check-array-index-bound-before-use.patch diff --git a/queue-3.10/acpi-fix-conflict-between-customized-dsdt-and-dsdt-local-copy.patch b/queue-3.10/acpi-fix-conflict-between-customized-dsdt-and-dsdt-local-copy.patch new file mode 100644 index 00000000000..fcdb8ed9a0a --- /dev/null +++ b/queue-3.10/acpi-fix-conflict-between-customized-dsdt-and-dsdt-local-copy.patch @@ -0,0 +1,46 @@ +From 73577d1df8e1f31f6b1a5eebcdbc334eb0330e47 Mon Sep 17 00:00:00 2001 +From: Lv Zheng +Date: Mon, 12 May 2014 15:50:16 +0800 +Subject: ACPI: Fix conflict between customized DSDT and DSDT local copy + +From: Lv Zheng + +commit 73577d1df8e1f31f6b1a5eebcdbc334eb0330e47 upstream. + +This patch fixes the following issue: +If DSDT is customized, no local DSDT copy is needed. + +References: https://bugzilla.kernel.org/show_bug.cgi?id=69711 +Signed-off-by: Enrico Etxe Arte +Signed-off-by: Lv Zheng +[rjw: Subject] +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/bus.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/acpi/bus.c ++++ b/drivers/acpi/bus.c +@@ -57,6 +57,12 @@ EXPORT_SYMBOL(acpi_root_dir); + + + #ifdef CONFIG_X86 ++#ifdef CONFIG_ACPI_CUSTOM_DSDT ++static inline int set_copy_dsdt(const struct dmi_system_id *id) ++{ ++ return 0; ++} ++#else + static int set_copy_dsdt(const struct dmi_system_id *id) + { + printk(KERN_NOTICE "%s detected - " +@@ -64,6 +70,7 @@ static int set_copy_dsdt(const struct dm + acpi_gbl_copy_dsdt_locally = 1; + return 0; + } ++#endif + + static struct dmi_system_id dsdt_dmi_table[] __initdata = { + /* diff --git a/queue-3.10/acpica-utstring-check-array-index-bound-before-use.patch b/queue-3.10/acpica-utstring-check-array-index-bound-before-use.patch new file mode 100644 index 00000000000..1969a88d80b --- /dev/null +++ b/queue-3.10/acpica-utstring-check-array-index-bound-before-use.patch @@ -0,0 +1,33 @@ +From 5d42b0fa25df7ef2f575107597c1aaebe2407d10 Mon Sep 17 00:00:00 2001 +From: David Binderman +Date: Fri, 4 Apr 2014 12:36:55 +0800 +Subject: ACPICA: utstring: Check array index bound before use. + +From: David Binderman + +commit 5d42b0fa25df7ef2f575107597c1aaebe2407d10 upstream. + +ACPICA BZ 1077. David Binderman. + +References: https://bugs.acpica.org/show_bug.cgi?id=1077 +Signed-off-by: David Binderman +Signed-off-by: Bob Moore +Signed-off-by: Lv Zheng +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/acpica/utstring.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/acpi/acpica/utstring.c ++++ b/drivers/acpi/acpica/utstring.c +@@ -349,7 +349,7 @@ void acpi_ut_print_string(char *string, + } + + acpi_os_printf("\""); +- for (i = 0; string[i] && (i < max_length); i++) { ++ for (i = 0; (i < max_length) && string[i]; i++) { + + /* Escape sequences */ + diff --git a/queue-3.10/series b/queue-3.10/series index 970059123b4..bb956bae619 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -40,3 +40,5 @@ usb-qcserial-add-additional-sierra-wireless-qmi-devices.patch usb-serial-fix-potential-runtime-pm-imbalance-at-device-remove.patch media-ivtv-fix-oops-when-no-firmware-is-loaded.patch media-stk1160-avoid-stack-allocated-buffer-for-control-urbs.patch +acpica-utstring-check-array-index-bound-before-use.patch +acpi-fix-conflict-between-customized-dsdt-and-dsdt-local-copy.patch -- 2.47.3