Commit 43d83af8 authored by Kees Cook's avatar Kees Cook

iommu/amd: Use struct_group() for memcpy() region

In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memcpy(), memmove(), and memset(), avoid
intentionally writing across neighboring fields.

Use struct_group() in struct ivhd_entry around members ext and hidh, so
they can be referenced together. This will allow memcpy() and sizeof()
to more easily reason about sizes, improve readability, and avoid future
warnings about writing beyond the end of ext.

"pahole" shows no size nor member offset changes to struct ivhd_entry.
"objdump -d" shows no object code changes.

Cc: Will Deacon <will@kernel.org>
Cc: iommu@lists.linux-foundation.org
Acked-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 241fe395
...@@ -121,8 +121,10 @@ struct ivhd_entry { ...@@ -121,8 +121,10 @@ struct ivhd_entry {
u8 type; u8 type;
u16 devid; u16 devid;
u8 flags; u8 flags;
u32 ext; struct_group(ext_hid,
u32 hidh; u32 ext;
u32 hidh;
);
u64 cid; u64 cid;
u8 uidf; u8 uidf;
u8 uidl; u8 uidl;
...@@ -1377,7 +1379,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1377,7 +1379,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
break; break;
} }
memcpy(hid, (u8 *)(&e->ext), ACPIHID_HID_LEN - 1); BUILD_BUG_ON(sizeof(e->ext_hid) != ACPIHID_HID_LEN - 1);
memcpy(hid, &e->ext_hid, ACPIHID_HID_LEN - 1);
hid[ACPIHID_HID_LEN - 1] = '\0'; hid[ACPIHID_HID_LEN - 1] = '\0';
if (!(*hid)) { if (!(*hid)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment