From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0633D347503; Wed, 8 Apr 2026 18:14:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775672098; cv=none; b=SeUToxilRCNMLd5iulERQdWM7+2NDJxwEFNFpJQD9ulx9fE6YWErCToum4eyorSC/a+UXFQbVhQl5zVShbxWW1ZPD26bDqq7XOKnTunxFQYwsUfaVbRivdYWpUgN6Fq5dAtcIBge8S4v4yvGnkosU7fS3iQBQHALUVckzdiCoXw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775672098; c=relaxed/simple; bh=maAm/lsly3Rk1xmvhk//M5FLiXfKIKKE6tyy7TY9rCg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QrY+BeQFdgF1LvupZD0nCQqVAxCCpK7E85mKPI1E77nMKCEBH+4RisDD923SS7U7LlhcSQnhqSVQemn0Y6Qq5JQFaaMfvcZ7Zi3XzJGGlNPvRmNQa7UMPJ3zFln2z1GXxq0O0SyKnnYLdLGpUD2yF+FU9Oi9U/PmfFipytCpv08= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JEvNzvEB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="JEvNzvEB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89173C19425; Wed, 8 Apr 2026 18:14:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1775672097; bh=maAm/lsly3Rk1xmvhk//M5FLiXfKIKKE6tyy7TY9rCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JEvNzvEBUds5FTOz/V2PObFC5jf1tTaiewxxFJRs0Z77hHLqKcYDhLwHyyllj8JgD 584wdu1PaQT/irYqJCwKXbpDu9paoHSzCcJ7I2hNh+XHSOG7raoNJe6yEGbxVQba5L 84FmwKGn3XC2Vr/k9NIi5rJuV80lVAeh5ddTKErw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Weiming Shi , Xiang Mei , Jamal Hadi Salim , Paolo Abeni , Sasha Levin Subject: [PATCH 6.1 187/312] net/sched: cls_fw: fix NULL pointer dereference on shared blocks Date: Wed, 8 Apr 2026 20:01:44 +0200 Message-ID: <20260408175940.745136683@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408175933.715315542@linuxfoundation.org> References: <20260408175933.715315542@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Xiang Mei [ Upstream commit faeea8bbf6e958bf3c00cb08263109661975987c ] The old-method path in fw_classify() calls tcf_block_q() and dereferences q->handle. Shared blocks leave block->q NULL, causing a NULL deref when an empty cls_fw filter is attached to a shared block and a packet with a nonzero major skb mark is classified. Reject the configuration in fw_change() when the old method (no TCA_OPTIONS) is used on a shared block, since fw_classify()'s old-method path needs block->q which is NULL for shared blocks. The fixed null-ptr-deref calling stack: KASAN: null-ptr-deref in range [0x0000000000000038-0x000000000000003f] RIP: 0010:fw_classify (net/sched/cls_fw.c:81) Call Trace: tcf_classify (./include/net/tc_wrapper.h:197 net/sched/cls_api.c:1764 net/sched/cls_api.c:1860) tc_run (net/core/dev.c:4401) __dev_queue_xmit (net/core/dev.c:4535 net/core/dev.c:4790) Fixes: 1abf272022cf ("net: sched: tcindex, fw, flow: use tcf_block_q helper to get struct Qdisc") Reported-by: Weiming Shi Signed-off-by: Xiang Mei Acked-by: Jamal Hadi Salim Link: https://patch.msgid.link/20260331050217.504278-1-xmei5@asu.edu Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/sched/cls_fw.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c index 6160ef7d646ac..366bcc960e43e 100644 --- a/net/sched/cls_fw.c +++ b/net/sched/cls_fw.c @@ -245,8 +245,18 @@ static int fw_change(struct net *net, struct sk_buff *in_skb, struct nlattr *tb[TCA_FW_MAX + 1]; int err; - if (!opt) - return handle ? -EINVAL : 0; /* Succeed if it is old method. */ + if (!opt) { + if (handle) + return -EINVAL; + + if (tcf_block_shared(tp->chain->block)) { + NL_SET_ERR_MSG(extack, + "Must specify mark when attaching fw filter to block"); + return -EINVAL; + } + + return 0; /* Succeed if it is old method. */ + } err = nla_parse_nested_deprecated(tb, TCA_FW_MAX, opt, fw_policy, NULL); -- 2.53.0