These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / acpi / acpica / tbfind.c

diff --git a/kernel/drivers/acpi/acpica/tbfind.c b/kernel/drivers/acpi/acpica/tbfind.c
index 0b879fc..405529d 100644 (file)
--- a/kernel/drivers/acpi/acpica/tbfind.c
+++ b/kernel/drivers/acpi/acpica/tbfind.c
@@ -68,24 +68,37 @@ acpi_status
 acpi_tb_find_table(char *signature,
                   char *oem_id, char *oem_table_id, u32 *table_index)
 {
-       u32 i;
        acpi_status status;
        struct acpi_table_header header;
+       u32 i;
 
        ACPI_FUNCTION_TRACE(tb_find_table);
 
+       /* Validate the input table signature */
+
+       if (!acpi_is_valid_signature(signature)) {
+               return_ACPI_STATUS(AE_BAD_SIGNATURE);
+       }
+
+       /* Don't allow the OEM strings to be too long */
+
+       if ((strlen(oem_id) > ACPI_OEM_ID_SIZE) ||
+           (strlen(oem_table_id) > ACPI_OEM_TABLE_ID_SIZE)) {
+               return_ACPI_STATUS(AE_AML_STRING_LIMIT);
+       }
+
        /* Normalize the input strings */
 
-       ACPI_MEMSET(&header, 0, sizeof(struct acpi_table_header));
+       memset(&header, 0, sizeof(struct acpi_table_header));
        ACPI_MOVE_NAME(header.signature, signature);
-       ACPI_STRNCPY(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
-       ACPI_STRNCPY(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
+       strncpy(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
+       strncpy(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
 
        /* Search for the table */
 
        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
-               if (ACPI_MEMCMP(&(acpi_gbl_root_table_list.tables[i].signature),
-                               header.signature, ACPI_NAME_SIZE)) {
+               if (memcmp(&(acpi_gbl_root_table_list.tables[i].signature),
+                          header.signature, ACPI_NAME_SIZE)) {
 
                        /* Not the requested table */
 
@@ -112,21 +125,20 @@ acpi_tb_find_table(char *signature,
 
                /* Check for table match on all IDs */
 
-               if (!ACPI_MEMCMP
+               if (!memcmp
                    (acpi_gbl_root_table_list.tables[i].pointer->signature,
                     header.signature, ACPI_NAME_SIZE) && (!oem_id[0]
                                                           ||
-                                                          !ACPI_MEMCMP
+                                                          !memcmp
                                                           (acpi_gbl_root_table_list.
                                                            tables[i].pointer->
                                                            oem_id,
                                                            header.oem_id,
                                                            ACPI_OEM_ID_SIZE))
                    && (!oem_table_id[0]
-                       || !ACPI_MEMCMP(acpi_gbl_root_table_list.tables[i].
-                                       pointer->oem_table_id,
-                                       header.oem_table_id,
-                                       ACPI_OEM_TABLE_ID_SIZE))) {
+                       || !memcmp(acpi_gbl_root_table_list.tables[i].pointer->
+                                  oem_table_id, header.oem_table_id,
+                                  ACPI_OEM_TABLE_ID_SIZE))) {
                        *table_index = i;
 
                        ACPI_DEBUG_PRINT((ACPI_DB_TABLES,