From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0EE8551CF65; Wed, 30 Sep 2026 16:17:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790785035; cv=none; b=pUQt/o/LbVdaXvRY0tqtPdjqPJtHvQN4eVZUgDEImQSJKf1UfWeqC8cY5YDT/UW5Lywyyj5iBbdH6nM4lkUNLjtcsE3oWrUo+V1+8OINzDNATyy0rxrXr1pN41hiQb2oPbDbGSaPDJDYY9dgT7gFlpjiovSdDD7itfVUsNM7cDY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790785035; c=relaxed/simple; bh=l6GD0SWf7aEfDb+KrG7A8UjGHohq4uMrdtn9r3yt0bw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sJN2vIvhlZ6TlSIqjH/Y0K7uhCKsZB0o355fk1pMUEGfPmKVlSD6/oWOMZfS+QCghcsS4G/UOGtOLLAEJve+W+OjpRzWa/Us1/VZkGu89byT12P//XEBj1GE4LibWxT9sxino+oEjN8JyJU99gER3DW855egsOPoBTuEH3krP5A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TxvGT7QM; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TxvGT7QM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89FBC1F000FF; Wed, 30 Sep 2026 16:17:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790785031; bh=zhqQEMiPgECuuPeXl3ZnpHrHpanuCKgHmTKXX1TzqoQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TxvGT7QMdCs5p+xqlnSrj0x9SOXA8wcq8d6NXoTgoi/NueSkknBcVedl2wmJ3g5bG B7v0T61+OIpumykGEBd4oKv72iL3xfb/H9okcZM6hrdj1TMRjeqfoiRmfhO9vymruy TSxzOSpHHlIDUcU3/jKdnnVNoerRziR8s2Ve2eEU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johannes Thumshirn , Ivy Lopez , John Garry , "Martin K. Petersen (Oracle)" , Sasha Levin Subject: [PATCH 6.1 366/982] scsi: mpt3sas: Avoid out-of-bounds cpumask_of_node() call in _base_assign_reply_queues() Date: Wed, 30 Sep 2026 17:18:22 +0200 Message-ID: <20260930152424.674218294@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ivy Lopez [ Upstream commit e0d26fe176a8db6ccad4ab38c5bab29391c1946b ] dev_to_node() can return NUMA_NO_NODE (-1) on systems without NUMA topology information for the PCI device, such as single-socket boards that don't expose device-to-node affinity. Passing -1 directly into cpumask_of_node() indexes node_to_cpumask_map[-1], an out-of-bounds array read caught by UBSAN: UBSAN: array-index-out-of-bounds in arch/x86/include/asm/topology.h:72:28 index -1 is out of range for type 'cpumask *[1024]' Fall back to cpu_online_mask when no NUMA node is available, rather than assuming dev_to_node() always returns a valid node index. Link: https://bugzilla.kernel.org/show_bug.cgi?id=221294 Suggested-by: Johannes Thumshirn Fixes: 728bbc6cbff7 ("scsi: mpt3sas: Affinity high iops queues IRQs to local node") Signed-off-by: Ivy Lopez Reviewed-by: John Garry Link: https://patch.msgid.link/20260825190313.24013-1-skunkolee@gmail.com Signed-off-by: Martin K. Petersen (Oracle) Signed-off-by: Sasha Levin --- drivers/scsi/mpt3sas/mpt3sas_base.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 479682770ee51..35d53c86e05e7 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -3228,7 +3228,10 @@ _base_assign_reply_queues(struct MPT3SAS_ADAPTER *ioc) * corresponding to high iops queues. */ if (ioc->high_iops_queues) { - mask = cpumask_of_node(dev_to_node(&ioc->pdev->dev)); + int node = dev_to_node(&ioc->pdev->dev); + + mask = (node == NUMA_NO_NODE) ? + cpu_online_mask : cpumask_of_node(node); for (index = 0; index < ioc->high_iops_queues; index++) { irq = pci_irq_vector(ioc->pdev, index); -- 2.53.0