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=1795023347; b=5ZZVURHfOTDJklQbPzY6365ro7f5G+KEOJpbBWEzO7X9yWUJO4ZTlsQcfa3kb30xCP4G u+FegV3lMGTLojug039nlNI4ov3+Gzjvjbq+ZXKGczVXvbZFEq4K9uCZHrT0NW1KXU5Mv XuzY990Jm0Dy95OipYPFPViWODCBBEOoJYFGclSUFRMr7mMAjGoihdICdgu+mq9RIOR8i bSJclWHPbqA36UjiJkHXkpgNuKsu9g/XvYfmNmqT5BLDcAqNfY0f49uC+JNJFifgLsO7N 8FUg90lW4mm2ylbsFKgR3au41+zS6NBrWowFmQ29CSKFABpDelwT5HHZF1l1eyeBNag== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795023347; 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=AkEMCglbn8s4JuOHuKXFTX2K1dNRHmZUH1xBtBttMv0=; b=Z2C7m1j7v/IFlqDWNIRsvQcqQtWhFOhVfYVP4ZkkLlWklvCJZoa681zyOPcYIxZW3Y/0 VWNrTt1I0jzOEKG9R+PpShEJ2hI6uVSOdVGIfWhxkN1E6SqVevyFn9I7P4aVI8M+S97Pc oGOZzcCK2RAk3PY6BQI2vyjAvIECgIlEiYJdvoRPxoi5lPIc7e7LsAywa/xGiZ8un+tsz 3ZDQNSLIkrjJJUmHNcsyZxGRQfpUI8FhX/EWn6lIULtz5pWa34OkiTADEpKxyKEuVcg8+ BcuSzId94r6bWxgOeml0WQit8tSN6uiY51Ba78DgMS3GcASGNUHKIOPBzKE5CpqLBMw== 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=a1lEt2Tr; 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 8D764606A334; Wed, 18 Nov 2026 17:35:47 +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=a1lEt2Tr Received: by smtp.kernel.org (Postfix) with ESMTPSA id E775D1F000C9; Wed, 18 Nov 2026 17:35:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795023347; bh=AkEMCglbn8s4JuOHuKXFTX2K1dNRHmZUH1xBtBttMv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=a1lEt2TrIFJZ8kIbMOGYg1ESog82E5p19CpvUyaTVWBoBA2qTdp2J/Kty5Npy7vAX 6wpwo0abWUPO5xq6DititxR1NN07PiKkvDAR634N9VPkxNGh+a+ebtwt7fEr9Mzk5m ebRs6dYFKMTqQ4RWeTQQESWlUKkcvcXydmLrA2fs= 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 0335/2151] scsi: mpi3mr: Fix out-of-bounds read in SAS topology change events Date: Wed, 18 Nov 2026 15:34:30 +0100 Message-ID: <20261118150134.200366447@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 9e220ce4bd0468e47cc9eea07e40799ebae6eda8 ] The number of entries in a SAS topology change event is used to walk the entry array without being compared against the amount of event data that was received, so the walk can run past the end of the buffer. Work out how many entries the payload can hold and skip the event if it claims more. Fixes: 13ef29ea4aa0 ("scsi: mpi3mr: Add support for device add/remove event handling") Signed-off-by: Chandrakanth Patil Link: https://patch.msgid.link/20260825210411.301535-11-chandrakanth.patil@broadcom.com Signed-off-by: Martin K. Petersen (Oracle) Signed-off-by: Sasha Levin --- drivers/scsi/mpi3mr/mpi3mr_os.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c index ba7bd376536d4..7c94897e458cf 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_os.c +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c @@ -2741,12 +2741,28 @@ static void mpi3mr_sastopochg_evt_th(struct mpi3mr_ioc *mrioc, struct mpi3_event_data_sas_topology_change_list *topo_evt = (struct mpi3_event_data_sas_topology_change_list *)event_reply->event_data; int i; - u16 handle; - u8 reason_code; + u16 handle, avail_len; + u8 reason_code, max_entries, num_entries; struct mpi3mr_tgt_dev *tgtdev = NULL; struct mpi3mr_stgt_priv_data *scsi_tgt_priv_data = NULL; - for (i = 0; i < topo_evt->num_entries; i++) { + avail_len = event_reply->event_data_length * 4; + if (avail_len < offsetof(struct mpi3_event_data_sas_topology_change_list, phy_entry)) { + ioc_err(mrioc, "SAS topology event: event data too small (%u bytes)\n", + avail_len); + return; + } + max_entries = (avail_len - + offsetof(struct mpi3_event_data_sas_topology_change_list, phy_entry)) / + sizeof(struct mpi3_event_sas_topo_phy_entry); + num_entries = topo_evt->num_entries; + if (num_entries > max_entries) { + ioc_err(mrioc, "SAS topology event: num_entries(%d) exceeds max(%d)\n", + num_entries, max_entries); + return; + } + + for (i = 0; i < num_entries; i++) { handle = le16_to_cpu(topo_evt->phy_entry[i].attached_dev_handle); if (!handle) continue; -- 2.53.0