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 3A2B249D588; Thu, 17 Sep 2026 16:58:56 +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=1789664337; cv=none; b=ARuq66o9VVT1HENl9NMb+SpG3FwjAyscLvWVsVUqCbh6oX2KpGmv+2X4lXskW6EUY/vCoMQPZlzUeJ25SZ6BzbGrhqg56JY33+dVnrd0ShS1WBzid770y5yDZq3iSd2OqbLebxSQCpMvvR5/aVMsQG8k9xhtnOO15gUVqUPIxXE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789664337; c=relaxed/simple; bh=Rg0fFL33EExzqfXNMKT5KQhFuPrvseKat/Ol7vDAi8s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g/+tBAKowWUs+aiCD1EfAnTPXry+P3JrevIfm1yv5BtkeBL6hsbSvkVgLzXaB40RN1xWzRerE+/iOoOaXkHetY3yyHr4N7Artrdwo8cY5tU5+VK4hwpGWpmez+jtUGbkKojIu65Y4A7X+DZZ6W4X13BzeZtADI0uWJATkKamz70= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=T3D+J2vs; 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="T3D+J2vs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 885E91F00893; Thu, 17 Sep 2026 16:58:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789664336; bh=9B6AiC7YW7KAFnMLpYTEtWlVGLFZP+pWggpqENX5xRY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=T3D+J2vs3O/UfYGX2HpG48P+CmXgCVKGh6S6qFuaGoHUmrqjfGocL8hyDzsh+ANp9 lld+aGfVWI/Tl+GGUGAdrR6MW7kuYBXkTFbTz2al8BLVJdlHBW2RtWqzL4Owi2P4dJ TtODTSTvmJRCeKSgLSnoQtPJsBjxrXv4SXp44/uE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Yang , Vladimir Oltean , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 0299/1250] net: dsa: sja1105: flower: reject cross-chip redirect Date: Thu, 17 Sep 2026 16:01:34 +0100 Message-ID: <20260917151600.223768816@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151551.901433442@linuxfoundation.org> References: <20260917151551.901433442@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Yang [ Upstream commit cfa5274a5dc2a23b957da5dc806d2ac0c7a66af0 ] dsa_port_from_netdev() may return a valid port from a different switch chip. Programming another chip's port index into the local hardware causes redirection to the wrong port, or an out-of-bounds access if the index exceeds the local chip's port count. Apply a minimal fix that adds a check to catch this case and adjusts the extack message. When cls->common.skip_sw is not set, the operation could instead redirect to the upstream port and let the software or upstream switch(es) handle the forward, but that is not addressed here. Signed-off-by: David Yang Reviewed-by: Vladimir Oltean Link: https://patch.msgid.link/20260530003940.2000994-1-mmyangfl@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/dsa/sja1105/sja1105_flower.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/sja1105/sja1105_flower.c b/drivers/net/dsa/sja1105/sja1105_flower.c index 05d8ed3121e7f..172fc163e1850 100644 --- a/drivers/net/dsa/sja1105/sja1105_flower.c +++ b/drivers/net/dsa/sja1105/sja1105_flower.c @@ -391,9 +391,9 @@ int sja1105_cls_flower_add(struct dsa_switch *ds, int port, struct dsa_port *to_dp; to_dp = dsa_port_from_netdev(act->dev); - if (IS_ERR(to_dp)) { + if (IS_ERR(to_dp) || to_dp->ds != ds) { NL_SET_ERR_MSG_MOD(extack, - "Destination not a switch port"); + "Destination not a local switch port"); return -EOPNOTSUPP; } -- 2.53.0