diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-01-04 13:42:21 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-01-04 13:42:21 +0100 |
| commit | e46201308a1e568059328e200282c8a62faa2f19 (patch) | |
| tree | d614d1d5f056b503faddeef322f6236db0e6f8df /drivers | |
| parent | Merge branches 'acpi-resource', 'acpi-numa', 'acpi-soc' and 'acpi-misc' (diff) | |
| parent | PNP: ACPI: fix fortify warning (diff) | |
| download | linux-e46201308a1e568059328e200282c8a62faa2f19.tar.gz linux-e46201308a1e568059328e200282c8a62faa2f19.zip | |
Merge branch 'pnp'
Merge a PNP update for 6.8-rc1:
- Adjust pnpacpi_parse_allocated_vendor() to use memcpy() on a full
structure field (Dmitry Antipov).
* pnp:
PNP: ACPI: fix fortify warning
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pnp/pnpacpi/rsparser.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index 4f05f610391b..c02ce0834c2c 100644 --- 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); } } |