2 files changed, 27 insertions, 6 deletions

diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index e1638ad5db4c..801d1963d7d8 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -474,12 +474,19 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
 
                 /* Get the table physical address (32-bit for RSDT, 64-bit for XSDT) */
 
-                status =
-                    acpi_tb_install_standard_table(acpi_tb_get_root_table_entry
-                                                   (table_entry,
-                                                    table_entry_size),
-                                                   ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,
-                                                   FALSE, TRUE, &table_index);
+                address =
+                    acpi_tb_get_root_table_entry(table_entry, table_entry_size);
+
+                /* Skip NULL entries in RSDT/XSDT */
+
+                if (!address) {
+                        goto next_table;
+                }
+
+                status = acpi_tb_install_standard_table(address,
+                                                        ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,
+                                                        FALSE, TRUE,
+                                                        &table_index);
 
                 if (ACPI_SUCCESS(status) &&
                     ACPI_COMPARE_NAME(&acpi_gbl_root_table_list.
@@ -488,6 +495,8 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
                         acpi_tb_parse_fadt(table_index);
                 }
 
+next_table:
+
                 table_entry += table_entry_size;
         }
 
diff --git a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
index e0699e6e1f26..ba7bad04dff1 100644
--- a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
+++ b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
@@ -720,6 +720,12 @@ static acpi_status osl_list_bios_tables(void)
                             (acpi_physical_address) (*ACPI_CAST32(table_data));
                 }
 
+                /* Skip NULL entries in RSDT/XSDT */
+
+                if (!table_address) {
+                        continue;
+                }
+
                 status = osl_map_table(table_address, NULL, &mapped_table);
                 if (ACPI_FAILURE(status)) {
                         return (status);
@@ -865,6 +871,12 @@ osl_get_bios_table(char *signature,
                                                              (table_data));
                         }
 
+                        /* Skip NULL entries in RSDT/XSDT */
+
+                        if (!table_address) {
+                                continue;
+                        }
+
                         status =
                             osl_map_table(table_address, NULL, &mapped_table);
                         if (ACPI_FAILURE(status)) {