Commit 8dd76337 authored by Gavrilov Ilia's avatar Gavrilov Ilia Committed by sanglipeng
Browse files

iommu/amd: Add a length limitation for the ivrs_acpihid command-line parameter 

stable inclusion
from stable-v5.10.175
commit f2a5ec7f7b28f9b9cd5fac232ff51019a7f7b9e9
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8711T

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f2a5ec7f7b28f9b9cd5fac232ff51019a7f7b9e9



--------------------------------

[ Upstream commit b6b26d86 ]

The 'acpiid' buffer in the parse_ivrs_acpihid function may overflow,
because the string specifier in the format string sscanf()
has no width limitation.

Found by InfoTeCS on behalf of Linux Verification Center
(linuxtesting.org) with SVACE.

Fixes: ca3bf5d4 ("iommu/amd: Introduces ivrs_acpihid kernel parameter")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarIlia.Gavrilov <Ilia.Gavrilov@infotecs.ru>
Reviewed-by: default avatarKim Phillips <kim.phillips@amd.com>
Link: https://lore.kernel.org/r/20230202082719.1513849-1-Ilia.Gavrilov@infotecs.ru


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 50309845

drivers/iommu/amd/init.c

+15 −1
Original line number Diff line number Diff line
@@ -3132,15 +3132,26 @@ static int __init parse_ivrs_hpet(char *str) 
	return 1;

}



#define ACPIID_LEN (ACPIHID_UID_LEN + ACPIHID_HID_LEN)



static int __init parse_ivrs_acpihid(char *str)

{

	u32 seg = 0, bus, dev, fn;

	char *hid, *uid, *p, *addr;

	char acpiid[ACPIHID_UID_LEN + ACPIHID_HID_LEN] = {0};

	char acpiid[ACPIID_LEN] = {0};

	int i;



	addr = strchr(str, '@');

	if (!addr) {

		addr = strchr(str, '=');

		if (!addr)

			goto not_found;



		++addr;



		if (strlen(addr) > ACPIID_LEN)

			goto not_found;



		if (sscanf(str, "[%x:%x.%x]=%s", &bus, &dev, &fn, acpiid) == 4 ||

		    sscanf(str, "[%x:%x:%x.%x]=%s", &seg, &bus, &dev, &fn, acpiid) == 5) {

			pr_warn("ivrs_acpihid%s option format deprecated; use ivrs_acpihid=%s@%04x:%02x:%02x.%d instead\n",
@@ -3153,6 +3164,9 @@ static int __init parse_ivrs_acpihid(char *str) 
	/* We have the '@', make it the terminator to get just the acpiid */

	*addr++ = 0;



	if (strlen(str) > ACPIID_LEN + 1)

		goto not_found;



	if (sscanf(str, "=%s", acpiid) != 1)

		goto not_found;