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=1795023353; b=MgxO1YFKozLo7ciXNpMYv67nxXsbAGF/vZiaTZAkB0ESqCJ8h39i4FHc/5r6M2CEBhHw dXoa+JOErwLPVyPvDDtUtQFX648UBD3d9vrglu+dUNnWtwrgQuIeHOf5ni9Sq62ChR2yb ve2dYrnHOGBSpovroZoZ2rTX0OTS51u88KxSYAvYnhamBe5oc0FlVPTAPaiNGTuyiXsKm DqpX+U3XVCLFwQOwGqMwoHN2oIs2PUCHurvCdZPuPLlj4hYuajc9gUW3yP/m9763ReN45 8fUcHDTgJ4JQQFRjG16wPFIb2r+dsxu3jZy4b/43CTT7hxZnLa9kNHE0XpIH8r/ldkg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795023353; 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=VABXNKDyH6K9qwN6QDAZSXXoi/qbeI+Gd3RMLmdZvsY=; b=Tjv0fBk/FJmnqJ2zajXEV8GGnZeIYNtKvloFaMl2FkvPaen6q0PYwE25RV2P7A+FqsrM BJQhMuy+Rf2ajzjtMpMCb9QTsRLjM5vRqdQbVn0dmxpoK1aFwLVJEMvvjxQYOYgWA2wP+ ZNzMltkqrY0M1C9t/BeCOPFayKnGy4orlHx4nSgwp0LKy0Lb0LMQx1AcqK6aMfzyMar4p k3xQCb1ZKYiJ0EQlSNSdnec/YBJDQyRw2IOOFGseN5vdROPxEvnTZ2pMSj2X4CVKOqQhb 57zzxYkx8uzF66B89Y+MRChso1+eW+05AM1rWoQd4c/RcBhOuZSd9KEyyrbG1Ov3YPw== 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="zSE/2bNC"; 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 5F23D606A325; Wed, 18 Nov 2026 17:35:53 +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=zSE/2bNC Received: by smtp.kernel.org (Postfix) with ESMTPSA id 753EC1F000C7; Wed, 18 Nov 2026 17:35:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795023353; bh=VABXNKDyH6K9qwN6QDAZSXXoi/qbeI+Gd3RMLmdZvsY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zSE/2bNC6pZUFIjanCPKwY+xGNYs1Fxdiei32EKDwTLNx1kvBn2drWqYqFUjIoTzo LI5m/UNxASlOgaJbeHL0Y4Ykdyj8F66FgXjm+620vSRwBwAaJjyWiOwUlEOCJrXSfq WewNGGRqeNK8Kcl4eVqRx2BTgk+3DZd7YoQUwwqc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chandrakanth Patil , "Martin K. Petersen (Oracle)" , Sasha Levin Subject: [PATCH 6.18 0337/2151] scsi: mpi3mr: Fix out-of-bounds read of event data Date: Wed, 18 Nov 2026 15:34:32 +0100 Message-ID: <20261118150134.282874725@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: Chandrakanth Patil [ Upstream commit 77554f01187d91c20f04d2a8e28270943ed64cca ] The event data length from the reply is used as is, both when caching log data and when sizing the buffer handed to the bottom half. A length larger than the frame makes both of them read past the end of it. Clamp the length to what the frame can hold. Fixes: 13ef29ea4aa0 ("scsi: mpi3mr: Add support for device add/remove event handling") Fixes: d0d19250ed81 ("scsi: mpi3mr: Rename log data save helper to reflect threaded/BH context") Signed-off-by: Chandrakanth Patil Link: https://patch.msgid.link/20260825210411.301535-12-chandrakanth.patil@broadcom.com Signed-off-by: Martin K. Petersen (Oracle) Signed-off-by: Sasha Levin --- drivers/scsi/mpi3mr/mpi3mr_os.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c index a2496f11ab991..8551aa47549e3 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_os.c +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c @@ -3032,7 +3032,7 @@ void mpi3mr_add_event_wait_for_device_refresh(struct mpi3mr_ioc *mrioc) void mpi3mr_os_handle_events(struct mpi3mr_ioc *mrioc, struct mpi3_event_notification_reply *event_reply) { - u16 evt_type, sz; + u16 evt_type, sz, avail_reply_room; struct mpi3mr_fwevt *fwevt = NULL; bool ack_req = 0, process_evt_bh = 0; @@ -3093,7 +3093,12 @@ void mpi3mr_os_handle_events(struct mpi3mr_ioc *mrioc, case MPI3_EVENT_DEVICE_INFO_CHANGED: case MPI3_EVENT_LOG_DATA: - sz = event_reply->event_data_length * 4; + if (mrioc->reply_sz > offsetof(struct mpi3_event_notification_reply, event_data)) + avail_reply_room = mrioc->reply_sz - + offsetof(struct mpi3_event_notification_reply, event_data); + else + avail_reply_room = 0; + sz = min_t(u16, event_reply->event_data_length * 4, avail_reply_room); mpi3mr_app_save_logdata_th(mrioc, (char *)event_reply->event_data, sz); break; @@ -3127,7 +3132,12 @@ void mpi3mr_os_handle_events(struct mpi3mr_ioc *mrioc, dprint_event_th(mrioc, "scheduling bottom half handler for event(0x%02x) - (0x%08x), ack_required=%d\n", evt_type, le32_to_cpu(event_reply->event_context), ack_req); - sz = event_reply->event_data_length * 4; + if (mrioc->reply_sz > offsetof(struct mpi3_event_notification_reply, event_data)) + avail_reply_room = mrioc->reply_sz - + offsetof(struct mpi3_event_notification_reply, event_data); + else + avail_reply_room = 0; + sz = min_t(u16, event_reply->event_data_length * 4, avail_reply_room); fwevt = mpi3mr_alloc_fwevt(sz); if (!fwevt) { dprint_event_th(mrioc, -- 2.53.0