From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795052918; b=LcC+NIDtx3nOR/uQn2Eu3nV85vhXP4zMPcBCmJoEDqEoQV9sYgTyKXKvbJ6lHtuJWeDU SXz9G1PbSg94HcUBTSxVR6RZ7ih6/mDkXCtIYLgzJupAi0yu5dem5QrKEyGCF5QDqrDWI uGKFrxgzQukzcZJq10VdmgQGQ7XJoAYplB+HJSuRU9orPbu3q1vCDC4ASb3TqxTEaicHK aRW4ovR85idadgFiWyiJZzzna3fycQqGyWETv/jvQQS6SfLFC0NNL87QfrfV4hmWqfjRu gpcQey0grfBaCTXd6MY20paH7Rcfqe05nURISM0RJ0dltyNUmnJjYqj1VinWxTtJmCA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795052918; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Uk+KMFBq3Y+wXOotpzDGQztZC25HCxrhg8R4EP1isL8=; b=oo8WEpH8/G2x5O6MzRuPeEidiH11vrxNmOyrh3nbLk3KS4eHvNwQf7+0YTtrWQH/Lw57 xPiUZmboj0IpfstkiYYVplhDC0ybr783m72XZmqFJO5jjB3FPLeTbRKsBqsfGjtqpf0n7 bY+YU21Q1CTXn9C9qRwmWM50V+zQ6L55SX27Uf6UqAUq+cBSjYiWjJdFkFb8l6CaHftxx ukXMd2hNj0FW+2yoJaxvGeF4/Sh6aSzOV3qEOoj1udwUUnEjUDTiZLV3avDcwoScT5R0V 1bezcHUyQsnV7P7dxYfIVLUbwklaegS/+8Mb6fCqDcexdDd7oqch3Wx0+fCc+Dmtl3w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=xJjIhDft; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3197606A330; Thu, 19 Nov 2026 01:48:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=xJjIhDft Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD3BE1F000C4; Thu, 19 Nov 2026 01:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795052918; bh=Uk+KMFBq3Y+wXOotpzDGQztZC25HCxrhg8R4EP1isL8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xJjIhDftxSvtJmJ86cDKpipWCFBulHNZXH9/iOjDj5sfIuLuDvAgrr+XDbiAn99N8 7/Me0odNfs+Br5Repp7cz1w/poiGDcchbOOB+40jWJg3AiJQDWb3aUWJKhzhk2hV21 N0I6GOlJcx2XzizPN4DbqRfHx1jKXUS4UKBlIgkI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Deucher , Jiale Yao , Sasha Levin Subject: [PATCH 5.15 0731/2214] drm/amdkfd: validate SRAT subtables before parsing Date: Wed, 18 Nov 2026 15:40:07 +0100 Message-ID: <20261118150041.081984131@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiale Yao [ Upstream commit 9866cb13ba4d39aa8fed34b765d4aecabe04f02e ] The KFD SRAT walker reads the first subtable length without checking that a header is present and trusts subsequent lengths when accessing CPU and generic affinity records. Invalid firmware lengths can therefore cause out-of-bounds reads. Validate the table header, every generic subtable range, and each supported typed record before reading its fields. Fixes: ddec8d3be0f8 ("drm/amdkfd: add ACPI SRAT parsing for topology") Reviewed-by: Alex Deucher Signed-off-by: Jiale Yao Signed-off-by: Alex Deucher (cherry picked from commit d76b655c98e8cc9e791b31502ad274f47dee2aae) Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 35 ++++++++++++++++++--------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c index e574aa32a111d..1c1010ae24529 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c @@ -1893,27 +1893,33 @@ static void kfd_find_numa_node_in_srat(struct kfd_dev *kdev) return; } + if (table_header->length < sizeof(struct acpi_table_srat)) + goto invalid_srat; + table_end = (unsigned long)table_header + table_header->length; /* Parse all entries looking for a match. */ sub_header = (struct acpi_subtable_header *) ((unsigned long)table_header + sizeof(struct acpi_table_srat)); - subtable_len = sub_header->length; - while (((unsigned long)sub_header) + subtable_len < table_end) { - /* - * If length is 0, break from this loop to avoid - * infinite loop. - */ - if (subtable_len == 0) { - pr_err("SRAT invalid zero length\n"); - break; - } + while ((unsigned long)sub_header < table_end) { + unsigned long start = (unsigned long)sub_header; + + if (table_end - start < sizeof(*sub_header)) + goto invalid_srat; + + subtable_len = sub_header->length; + if (subtable_len < sizeof(*sub_header) || + subtable_len > table_end - start) + goto invalid_srat; switch (sub_header->type) { case ACPI_SRAT_TYPE_CPU_AFFINITY: cpu = (struct acpi_srat_cpu_affinity *)sub_header; + if (subtable_len < sizeof(*cpu)) + goto invalid_srat; + pxm = *((u32 *)cpu->proximity_domain_hi) << 8 | cpu->proximity_domain_lo; if (pxm > max_pxm) @@ -1921,6 +1927,9 @@ static void kfd_find_numa_node_in_srat(struct kfd_dev *kdev) break; case ACPI_SRAT_TYPE_GENERIC_AFFINITY: gpu = (struct acpi_srat_generic_affinity *)sub_header; + if (subtable_len < sizeof(*gpu)) + goto invalid_srat; + bdf = *((u16 *)(&gpu->device_handle[0])) << 16 | *((u16 *)(&gpu->device_handle[2])); if (bdf == pci_id) { @@ -1937,9 +1946,13 @@ static void kfd_find_numa_node_in_srat(struct kfd_dev *kdev) sub_header = (struct acpi_subtable_header *) ((unsigned long)sub_header + subtable_len); - subtable_len = sub_header->length; } + goto out; + +invalid_srat: + pr_err("SRAT contains an invalid subtable\n"); +out: acpi_put_table(table_header); /* Workaround bad cpu-gpu binding case */ -- 2.53.0