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 58C34477E36; Tue, 16 Jun 2026 17:20:54 +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=1781630455; cv=none; b=DZClU5WcmQ1iMoAS0BEScXx9OBzSW0QxnHn51go7ZIYC/f8wMl814Gip2Y+Gm6BH+555k90rkmzyuDarF/4Ihz7bqLse8srYVXIHzUPr0MYQlK0XIxTi015jvqUVSFcklMv5Au/9zFTxyQB+2TxJPakr+Tca8RFuPgOVRy0UgVQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781630455; c=relaxed/simple; bh=odioidvh4kGxeaQ4EXpYcA7yMyxbymdNOZKpeGOwWvI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mpZDXluUtO215/v6NwQsc6LzE8Uj5BxReav5kj/nyIz8IgzCsXNzQtW+GGp9u+27erXg1ocuJ1/ootZJ7QSaKSgPzU/XkrS4B+URJboqs5RLfd3UY9cs4WeV5QFrHcmKi11I+m2IuPG54KA+zQ/jSs7j9q3oxZB5xc126+f2jG4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=I4L1SBOK; 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="I4L1SBOK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC2961F000E9; Tue, 16 Jun 2026 17:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781630454; bh=62ObmOQ/85Ky59U+UG9teKOwCtm+vuXiGNjzfkgw184=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=I4L1SBOKfRpI3Bu+URODs3LFarzRzusKOuQC89VPDHLCON6z1vtrPmAvRbfQ9u2gB Ajljt4Aa5uAfEFCKu/ijE//L2mpj2CqbTNRhCqrNSXOhaa/9zAl5KcwWH+Lc+oVcRC Q7Gtii5Ykzea49epuStp3sshuqDG5rPtiDcinnZY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+690d3e3ffa7335ac10eb@syzkaller.appspotmail.com, Florian Westphal , Sasha Levin Subject: [PATCH 6.1 014/522] netfilter: xt_cpu: prefer raw_smp_processor_id Date: Tue, 16 Jun 2026 20:22:41 +0530 Message-ID: <20260616145126.144237310@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@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: Florian Westphal [ Upstream commit c376f07e16c02239ed44cabb97145d03f65b4d15 ] With PREEMPT_RCU we get splat: BUG: using smp_processor_id() in preemptible [..] caller is cpu_mt+0x53/0xd0 net/netfilter/xt_cpu.c:37 CPU: 1 .. Comm: syz.3.1377 #0 PREEMPT(full) Call Trace: dump_stack_lvl+0xe8/0x150 lib/dump_stack.c:120 check_preemption_disabled+0xd3/0xe0 lib/smp_processor_id.c:47 cpu_mt+0x53/0xd0 net/netfilter/xt_cpu.c:37 [..] Just use raw version instead. This is similar to 14d14a5d2957 ("netfilter: nft_meta: use raw_smp_processor_id()"). Fixes: 0ca743a55991 ("netfilter: nf_tables: add compatibility layer for x_tables") Reported-by: syzbot+690d3e3ffa7335ac10eb@syzkaller.appspotmail.com Signed-off-by: Florian Westphal Signed-off-by: Sasha Levin --- net/netfilter/xt_cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/xt_cpu.c b/net/netfilter/xt_cpu.c index 3bdc302a0f9137..9cb259902a586b 100644 --- a/net/netfilter/xt_cpu.c +++ b/net/netfilter/xt_cpu.c @@ -34,7 +34,7 @@ static bool cpu_mt(const struct sk_buff *skb, struct xt_action_param *par) { const struct xt_cpu_info *info = par->matchinfo; - return (info->cpu == smp_processor_id()) ^ info->invert; + return (info->cpu == raw_smp_processor_id()) ^ info->invert; } static struct xt_match cpu_mt_reg __read_mostly = { -- 2.53.0