Commit e461b8c9 authored by Alexander Monakov's avatar Alexander Monakov Committed by Joerg Roedel

iommu/amd: Fix over-read of ACPI UID from IVRS table

IVRS parsing code always tries to read 255 bytes from memory when
retrieving ACPI device path, and makes an assumption that firmware
provides a zero-terminated string. Both of those are bugs: the entry
is likely to be shorter than 255 bytes, and zero-termination is not
guaranteed.

With Acer SF314-42 firmware these issues manifest visibly in dmesg:

AMD-Vi: ivrs, add hid:AMDI0020, uid:\_SB.FUR0\xf0\xa5, rdevid:160
AMD-Vi: ivrs, add hid:AMDI0020, uid:\_SB.FUR1\xf0\xa5, rdevid:160
AMD-Vi: ivrs, add hid:AMDI0020, uid:\_SB.FUR2\xf0\xa5, rdevid:160
AMD-Vi: ivrs, add hid:AMDI0020, uid:\_SB.FUR3>\x83e\x8d\x9a\xd1...

The first three lines show how the code over-reads adjacent table
entries into the UID, and in the last line it even reads garbage data
beyond the end of the IVRS table itself.

Since each entry has the length of the UID (uidl member of ivhd_entry
struct), use that for memcpy, and manually add a zero terminator.

Avoid zero-filling hid and uid arrays up front, and instead ensure
the uid array is always zero-terminated. No change needed for the hid
array, as it was already properly zero-terminated.

Fixes: 2a0cb4e2 ("iommu/amd: Add new map for storing IVHD dev entry type HID")
Signed-off-by: default avatarAlexander Monakov <amonakov@ispras.ru>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: iommu@lists.linux-foundation.org
Link: https://lore.kernel.org/r/20200511102352.1831-1-amonakov@ispras.ruSigned-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 2ef96a5b
...@@ -1329,8 +1329,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1329,8 +1329,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
} }
case IVHD_DEV_ACPI_HID: { case IVHD_DEV_ACPI_HID: {
u16 devid; u16 devid;
u8 hid[ACPIHID_HID_LEN] = {0}; u8 hid[ACPIHID_HID_LEN];
u8 uid[ACPIHID_UID_LEN] = {0}; u8 uid[ACPIHID_UID_LEN];
int ret; int ret;
if (h->type != 0x40) { if (h->type != 0x40) {
...@@ -1347,6 +1347,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1347,6 +1347,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
break; break;
} }
uid[0] = '\0';
switch (e->uidf) { switch (e->uidf) {
case UID_NOT_PRESENT: case UID_NOT_PRESENT:
...@@ -1361,8 +1362,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1361,8 +1362,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
break; break;
case UID_IS_CHARACTER: case UID_IS_CHARACTER:
memcpy(uid, (u8 *)(&e->uid), ACPIHID_UID_LEN - 1); memcpy(uid, &e->uid, e->uidl);
uid[ACPIHID_UID_LEN - 1] = '\0'; uid[e->uidl] = '\0';
break; break;
default: default:
......
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