PNP: ACPI: fix fortify warning

[sfrench/cifs-2.6.git] / drivers / pnp / pnpacpi / rsparser.c

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 4f05f610391b006c9415c0e2537b5e3ae9260c6c..c02ce0834c2cd5da44b7b1ab04ef949f04b774ce 100644 (file)
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -151,13 +151,13 @@ static int vendor_resource_matches(struct pnp_dev *dev,
 static void pnpacpi_parse_allocated_vendor(struct pnp_dev *dev,
                                    struct acpi_resource_vendor_typed *vendor)
 {
-       if (vendor_resource_matches(dev, vendor, &hp_ccsr_uuid, 16)) {
-               u64 start, length;
+       struct { u64 start, length; } range;
 
-               memcpy(&start, vendor->byte_data, sizeof(start));
-               memcpy(&length, vendor->byte_data + 8, sizeof(length));
-
-               pnp_add_mem_resource(dev, start, start + length - 1, 0);
+       if (vendor_resource_matches(dev, vendor, &hp_ccsr_uuid,
+                                   sizeof(range))) {
+               memcpy(&range, vendor->byte_data, sizeof(range));
+               pnp_add_mem_resource(dev, range.start, range.start +
+                                    range.length - 1, 0);
        }
 }