ACPI, APEI, EINJ Allow empty Trigger Error Action Table

According to the ACPI spec [1] section 18.6.4 the TRIGGER_ERROR action
table can consists of zero elements.

[1] Advanced Configuration and Power Interface Specification
    Revision 5.0, December 6, 2011
	http://www.acpi.info/DOWNLOADS/ACPIspec50.pdf

Signed-off-by: Niklas Söderlund <niklas.soderlund@ericsson.com>
Acked-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Niklas Söderlund 2012-01-09 16:49:44 +01:00 коммит произвёл Len Brown
Родитель 1001a3a307
Коммит 4c40aed869
1 изменённых файлов: 6 добавлений и 1 удалений

Просмотреть файл

@ -276,7 +276,7 @@ static int einj_check_trigger_header(struct acpi_einj_trigger *trigger_tab)
if (trigger_tab->header_size != sizeof(struct acpi_einj_trigger)) if (trigger_tab->header_size != sizeof(struct acpi_einj_trigger))
return -EINVAL; return -EINVAL;
if (trigger_tab->table_size > PAGE_SIZE || if (trigger_tab->table_size > PAGE_SIZE ||
trigger_tab->table_size <= trigger_tab->header_size) trigger_tab->table_size < trigger_tab->header_size)
return -EINVAL; return -EINVAL;
if (trigger_tab->entry_count != if (trigger_tab->entry_count !=
(trigger_tab->table_size - trigger_tab->header_size) / (trigger_tab->table_size - trigger_tab->header_size) /
@ -340,6 +340,11 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
"The trigger error action table is invalid\n"); "The trigger error action table is invalid\n");
goto out_rel_header; goto out_rel_header;
} }
/* No action structures in the TRIGGER_ERROR table, nothing to do */
if (!trigger_tab->entry_count)
goto out_rel_header;
rc = -EIO; rc = -EIO;
table_size = trigger_tab->table_size; table_size = trigger_tab->table_size;
r = request_mem_region(trigger_paddr + sizeof(*trigger_tab), r = request_mem_region(trigger_paddr + sizeof(*trigger_tab),