From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0E81CCD4F51 for ; Sun, 17 May 2026 19:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=eovcFph9tqFUfu1//990hKjDgwuqnND/k7DcJtK57to=; b=zda7/dfwFKNczlX3w/mTIj81Xv AGgbbOiNAr1WB7IlKdWO5XapGpWtNSaOpV55kErkaR9Z5fPDyC7yz5Tuy9J2wQGdfANBMlgDH89ZL oFLoJCNXYogmNBAr3TtPf9c/w0Fvt9xrHzcQ0jY+hlHlmfh+FWwURqnc2NLNYLuxwntd8pBeG1+Hi F6wkLx/DU6M+/PTcy/N079r0zYfWnhhDXpDnYeoMUJnUbktHF1A+Lz3RgEOrrxLieiWGSQh+BZZSO WcccGtehsECgXi5S9OC7YTjNSz/x/GMwbiS0CP2/VlzxRPbQfkh9lh+EXpRZ2S17ULbU5DJ4FG/2k lUB0+gOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wOgmn-0000000DI4j-1AwK; Sun, 17 May 2026 19:04:25 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wOgmi-0000000DI2g-3VQB for linux-arm-kernel@lists.infradead.org; Sun, 17 May 2026 19:04:22 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 904E242B81; Sun, 17 May 2026 19:04:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8F08C2BCB8; Sun, 17 May 2026 19:04:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779044660; bh=wmrINHNC5u8IqUM6rO4aCaP3fCrqwycCjOZWb1jejqw=; h=From:Date:Subject:References:In-Reply-To:To:From; b=ai79QUYsZCUANw/WsOyZXZkGmpszQ0q5nq/YwbMJ00NRrvKOmpgtvFUcbcG+AF409 wAX2xAF59bIQLNZd9nOehDMcTmPSbJt7nsNiJfrN5D0MfduwnfPf24CBGJDAt9cyV3 xKM2NTNXqJImk+Trm1fePnju3KuGTenrjrZIfOOabrcpYwzOA8lfxX9bbUghmtU6ie GkazHmueVmMzqT0okZ5bqHLMS0h7aHwkjmdZQqI1nflPF58y8mBIP0d0U5FfYyTn6A mgkTyCih4nokFh8Ao8mdBcmRntrF6zWR9hdc7tnYhqkRsucrhNaCjJbwjZc8ClM2X2 DMh+4I0+O05xw== From: Sudeep Holla Date: Sun, 17 May 2026 20:02:41 +0100 Subject: [PATCH 2/4] firmware: arm_scmi: Validate BASE_ERROR_EVENT payload size MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260517-scmi_fixes-v1-2-d86daec4defd@kernel.org> References: <20260517-scmi_fixes-v1-0-d86daec4defd@kernel.org> In-Reply-To: <20260517-scmi_fixes-v1-0-d86daec4defd@kernel.org> To: Cristian Marussi , arm-scmi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sudeep Holla X-Mailer: b4 0.15.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260517_120421_631257_7D596630 X-CRM114-Status: GOOD ( 11.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org BASE_ERROR_EVENT carries a variable number of message reports, with the count encoded in error_status. The notification parser used that count without checking whether the received payload contained all reported entries. Reject truncated payloads before copying the report array. Signed-off-by: Sudeep Holla --- drivers/firmware/arm_scmi/base.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/arm_scmi/base.c b/drivers/firmware/arm_scmi/base.c index 4df2620e3c5d..d08a4f6a9ced 100644 --- a/drivers/firmware/arm_scmi/base.c +++ b/drivers/firmware/arm_scmi/base.c @@ -325,6 +325,8 @@ static void *scmi_base_fill_custom_report(const struct scmi_protocol_handle *ph, void *report, u32 *src_id) { int i; + u32 error_status; + size_t expected_sz; const struct scmi_base_error_notify_payld *p = payld; struct scmi_base_error_report *r = report; @@ -338,10 +340,19 @@ static void *scmi_base_fill_custom_report(const struct scmi_protocol_handle *ph, if (evt_id != SCMI_EVENT_BASE_ERROR_EVENT || sizeof(*p) < payld_sz) return NULL; + expected_sz = sizeof(p->agent_id) + sizeof(p->error_status); + if (payld_sz < expected_sz) + return NULL; + r->timestamp = timestamp; r->agent_id = le32_to_cpu(p->agent_id); - r->fatal = IS_FATAL_ERROR(le32_to_cpu(p->error_status)); - r->cmd_count = ERROR_CMD_COUNT(le32_to_cpu(p->error_status)); + error_status = le32_to_cpu(p->error_status); + r->fatal = IS_FATAL_ERROR(error_status); + r->cmd_count = ERROR_CMD_COUNT(error_status); + expected_sz += r->cmd_count * sizeof(p->msg_reports[0]); + if (payld_sz < expected_sz) + return NULL; + for (i = 0; i < r->cmd_count; i++) r->reports[i] = le64_to_cpu(p->msg_reports[i]); *src_id = 0; -- 2.43.0