diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-06 19:42:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-06 19:42:00 +0200 |
| commit | 570d58b12fbf7bae0ba72d929ccf914a4df5ca7c (patch) | |
| tree | dfed4e4970ba5a5a4c4c726b4d55d9f4394683c3 /drivers/iommu/amd/init.c | |
| parent | 502ad6e5a6196840976c4c84b2ea2f9769942fbe (diff) | |
| parent | 92a09c47464d040866cf2b4cd052bc60555185fb (diff) | |
Merge tag 'v6.15-rc5' into x86/msr, to pick up fixes and to resolve conflicts
Conflicts:
drivers/cpufreq/intel_pstate.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/iommu/amd/init.c')
| -rw-r--r-- | drivers/iommu/amd/init.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index dd9e26b7b718..14aa0d77df26 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -3664,6 +3664,14 @@ found: while (*uid == '0' && *(uid + 1)) uid++; + if (strlen(hid) >= ACPIHID_HID_LEN) { + pr_err("Invalid command line: hid is too long\n"); + return 1; + } else if (strlen(uid) >= ACPIHID_UID_LEN) { + pr_err("Invalid command line: uid is too long\n"); + return 1; + } + i = early_acpihid_map_size++; memcpy(early_acpihid_map[i].hid, hid, strlen(hid)); memcpy(early_acpihid_map[i].uid, uid, strlen(uid)); |