[systemd-commits] src/shared

[Kay Sievers]

 src/shared/acpi-fpdt.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 6c7980093c4e39d07bf06484f96f489e236c7c29
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Oct 10 01:38:11 2013 +0200

    do not accept "garbage" from acpi firmware performance data (FPDT)
    
    00000000  46 42 50 54 38 00 00 00  02 00 30 02 00 00 00 00  |FBPT8.....0.....|
    00000010  23 45 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |#E..............|
    00000020  f5 6a 51 00 00 00 00 00  00 00 00 00 00 00 00 00  |.jQ.............|
    00000030  00 00 00 00 00 00 00 00  70 74 61 6c 58 00 00 00  |........ptalX...|

diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
index af58c7c..75648b4 100644
--- a/src/shared/acpi-fpdt.c
+++ b/src/shared/acpi-fpdt.c
@@ -146,6 +146,11 @@ int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) {
         if (brec.type != ACPI_FPDT_BOOT_REC)
                 return -EINVAL;
 
+        if (brec.startup_start == 0 || brec.exit_services_exit < brec.startup_start)
+                return -EINVAL;
+        if (brec.exit_services_exit > NSEC_PER_HOUR)
+                return -EINVAL;
+
         if (loader_start)
                 *loader_start = brec.startup_start / 1000;
         if (loader_exit)