Skip to content

Commit e462013

Browse files
committed
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
2 parents 4ab8d27 + ba3f505 commit e462013

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/pnp/pnpacpi/rsparser.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@ static int vendor_resource_matches(struct pnp_dev *dev,
151151
static void pnpacpi_parse_allocated_vendor(struct pnp_dev *dev,
152152
struct acpi_resource_vendor_typed *vendor)
153153
{
154-
if (vendor_resource_matches(dev, vendor, &hp_ccsr_uuid, 16)) {
155-
u64 start, length;
154+
struct { u64 start, length; } range;
156155

157-
memcpy(&start, vendor->byte_data, sizeof(start));
158-
memcpy(&length, vendor->byte_data + 8, sizeof(length));
159-
160-
pnp_add_mem_resource(dev, start, start + length - 1, 0);
156+
if (vendor_resource_matches(dev, vendor, &hp_ccsr_uuid,
157+
sizeof(range))) {
158+
memcpy(&range, vendor->byte_data, sizeof(range));
159+
pnp_add_mem_resource(dev, range.start, range.start +
160+
range.length - 1, 0);
161161
}
162162
}
163163

0 commit comments

Comments
 (0)