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=1795023112; b=j/ZqJUqJYVEKnImcUo5uFwRonfsGPiluesYqqSxeVuCSKvIk3EhwXXInfADRz0qCZ1Lj 5k7aJRRUhAt4BHYRLUlsfqsFafis7XZbHsq5ff8O0xwQH8UZ+jRHEPzCRvoVqAwB9G94U xRnyh4rjyfoLvdp1ctvyXt2n5hfAJAhQ4NK+wbz3b64Ie0Ycb9kFXXggMNVv89jAFvdg6 6V1xhW3Zwcqwf4zRhVzpP5W3K9kQk3J7jVtz8Z/aKVsx/edqPPZB6pIULFURffNCm6oKl y74Wrth8YbBa8b4KdLjeYWPytWGw5C4aP1UNSHSWDKoi64bE951qeJxEXd0WxoJwXoA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795023112; 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=pJ+VY8/AF2pJDOrPnPvxoOcN7mGvpSWlEUdeB/3Tg5k=; b=uzhLA2Mmd5z5oLGWvZIibyTyuF+mvKopTg7+Z1AAogWSOa+wSPU00dO1Rgehkt4tkwGN DSZ8MH/B3Det51c1T6Hj3Or+SSzbPysw8WLXp2683fED6SC1X2L1DqTtIT6SNX1PYyaRH yRJgl/2Yfb9xk8ESeISxpdueTE66fCprVeqp7GxDWIk9lyksLb3c0kTKYmpQByYvQLN32 lW+gUw7dAnXTRGAQ9uGVUCS7FYXbqwIf87waS0P9XWH+0g+cx4zPUX0f0H7zydpr/VeBf xPxY0lwetTF44fUl8kWbZTe8tEFXeIvRaCcPmLY+KBsjUFKFloEfm9lECikUVf0qLcQ== 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=O7WMHqc9; 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 BA34D606A325; Wed, 18 Nov 2026 17:31:52 +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=O7WMHqc9 Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA63F1F000C4; Wed, 18 Nov 2026 17:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795023112; bh=pJ+VY8/AF2pJDOrPnPvxoOcN7mGvpSWlEUdeB/3Tg5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=O7WMHqc9oHKA4X4t8g8edqyLJDJ5malgkfpOiiG2stMxb/4/yj43YsXUnceBCKBdq O5xJqjYEXmVfian/o/w67Jvj7TvzGBaCB3G+0IVZBJb3D8aqelO58OMf3rq9MNmTmp mHlMD1znfRyXj9Tvb5Qj7f9XoRbtfsuaJJrGersI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot@kernel.org, Hanjun Guo , Shuai Xue , Dave Jiang , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.18 0254/2151] efi/cper: Read only validated fields in cper_mem_err_pack() Date: Wed, 18 Nov 2026 15:33:09 +0100 Message-ID: <20261118150131.041067928@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@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 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Jiang [ Upstream commit 92480a2b00a15b0add512b6fc474151ec5340a8e ] cper_mem_err_pack() copies extended, rank, mem_array_handle and mem_dev_handle unconditionally. Those live at offsets 73 to 79, past the end of struct cper_sec_mem_err_old, the 73-byte UEFI 2.1/2.2 layout that older firmware still emits and that cper_estatus_print_section() admits. On such a record the copy reads up to seven bytes past the payload, and off the end of the error status block when that section is the last one. Copy each of the four only when its validation bit is set, and zero it otherwise. Nothing is lost: a 2.1/2.2 record leaves those bits clear, and every consumer of struct cper_mem_err_compact already gates the fields on the same bits. Zeroing also stops callers reading them back out of the uninitialised on-stack struct they pass in. Reported-by: sashiko-bot@kernel.org Closes: https://sashiko.dev/#/patchset/20260714231835.303081-1-dave.jiang@intel.com?part=7 Fixes: 2dfb7d51a61d ("trace, RAS: Add eMCA trace event interface") Reviewed-by: Hanjun Guo Reviewed-by: Shuai Xue Signed-off-by: Dave Jiang Link: https://patch.msgid.link/20260904172337.1409775-11-dave.jiang@intel.com Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/firmware/efi/cper.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c index 254f0564a5778..7fd1dc543130a 100644 --- a/drivers/firmware/efi/cper.c +++ b/drivers/firmware/efi/cper.c @@ -389,10 +389,28 @@ void cper_mem_err_pack(const struct cper_sec_mem_err *mem, cmem->requestor_id = mem->requestor_id; cmem->responder_id = mem->responder_id; cmem->target_id = mem->target_id; - cmem->extended = mem->extended; - cmem->rank = mem->rank; - cmem->mem_array_handle = mem->mem_array_handle; - cmem->mem_dev_handle = mem->mem_dev_handle; + + /* + * These four sit past the end of the UEFI 2.1/2.2 layout, which older + * firmware still emits, so reading them unconditionally runs off a + * short record. Every consumer of the compact record gates them on the + * same validation bits, so leave them zero when firmware does not + * claim them. + */ + cmem->extended = 0; + cmem->rank = 0; + cmem->mem_array_handle = 0; + cmem->mem_dev_handle = 0; + + if (mem->validation_bits & + (CPER_MEM_VALID_ROW_EXT | CPER_MEM_VALID_CHIP_ID)) + cmem->extended = mem->extended; + if (mem->validation_bits & CPER_MEM_VALID_RANK_NUMBER) + cmem->rank = mem->rank; + if (mem->validation_bits & CPER_MEM_VALID_CARD_HANDLE) + cmem->mem_array_handle = mem->mem_array_handle; + if (mem->validation_bits & CPER_MEM_VALID_MODULE_HANDLE) + cmem->mem_dev_handle = mem->mem_dev_handle; } EXPORT_SYMBOL_GPL(cper_mem_err_pack); -- 2.53.0