summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Binderman <dcb314@hotmail.com>2014-04-04 12:36:55 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-30 20:09:44 -0700
commit5e43bc687fbbd009b7dfd2c0eb73ca6e3dd6cf85 (patch)
tree57344c0fd35d42cc86d9c44db803fb3ca343d8de
parent50f865a928e13c8c5de0b8d3443387ea526b1da9 (diff)
downloadlinux-3.10-5e43bc687fbbd009b7dfd2c0eb73ca6e3dd6cf85.tar.gz
linux-3.10-5e43bc687fbbd009b7dfd2c0eb73ca6e3dd6cf85.tar.bz2
linux-3.10-5e43bc687fbbd009b7dfd2c0eb73ca6e3dd6cf85.zip
ACPICA: utstring: Check array index bound before use.
commit 5d42b0fa25df7ef2f575107597c1aaebe2407d10 upstream. ACPICA BZ 1077. David Binderman. References: https://bugs.acpica.org/show_bug.cgi?id=1077 Signed-off-by: David Binderman <dcb314@hotmail.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/acpi/acpica/utstring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/utstring.c b/drivers/acpi/acpica/utstring.c
index b3e36a81aa4..ca6d2acafa6 100644
--- a/drivers/acpi/acpica/utstring.c
+++ b/drivers/acpi/acpica/utstring.c
@@ -349,7 +349,7 @@ void acpi_ut_print_string(char *string, u8 max_length)
}
acpi_os_printf("\"");
- for (i = 0; string[i] && (i < max_length); i++) {
+ for (i = 0; (i < max_length) && string[i]; i++) {
/* Escape sequences */