daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
572a44
From d6987c081c5b0d1a2d9083b3d50fb78c63ab4904 Mon Sep 17 00:00:00 2001
572a44
From: Kay Sievers <kay@vrfy.org>
572a44
Date: Thu, 10 Oct 2013 01:38:11 +0200
572a44
Subject: [PATCH] do not accept "garbage" from acpi firmware performance data
572a44
 (FPDT)
572a44
572a44
00000000  46 42 50 54 38 00 00 00  02 00 30 02 00 00 00 00  |FBPT8.....0.....|
572a44
00000010  23 45 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |#E..............|
572a44
00000020  f5 6a 51 00 00 00 00 00  00 00 00 00 00 00 00 00  |.jQ.............|
572a44
00000030  00 00 00 00 00 00 00 00  70 74 61 6c 58 00 00 00  |........ptalX...|
572a44
---
572a44
 src/shared/acpi-fpdt.c | 5 +++++
572a44
 1 file changed, 5 insertions(+)
572a44
572a44
diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
572a44
index af58c7c..75648b4 100644
572a44
--- a/src/shared/acpi-fpdt.c
572a44
+++ b/src/shared/acpi-fpdt.c
572a44
@@ -146,6 +146,11 @@ int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) {
572a44
         if (brec.type != ACPI_FPDT_BOOT_REC)
572a44
                 return -EINVAL;
572a44
 
572a44
+        if (brec.startup_start == 0 || brec.exit_services_exit < brec.startup_start)
572a44
+                return -EINVAL;
572a44
+        if (brec.exit_services_exit > NSEC_PER_HOUR)
572a44
+                return -EINVAL;
572a44
+
572a44
         if (loader_start)
572a44
                 *loader_start = brec.startup_start / 1000;
572a44
         if (loader_exit)