From nobody Sat Feb 7 18:15:16 2026 Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C76240F8ED for ; Wed, 4 Feb 2026 15:38:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770219518; cv=none; b=U1zrNpuv/ug4u49EDYzJpXSrozENBn9wYXGIR0ikwcenXOQx702bMWB0Iym/9CAlQ9dmD1Iz9pvN/FOsrbc82ZTkUJ4wbotRnIDJnr/K90bvpJtYVQKEhWgX83q/vCnGTmNwbTEqve2BocQlneV0Thg04YJfgO9sFbsgbP7XJNI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770219518; c=relaxed/simple; bh=MxODx3pS4AdMwobsyC+HGet1jyKV2KIg3yAsOJarsoo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aWrXpZPPkbGNBzdwwli7wg/WQa0qoxPxmHKR5fWRavFt0iwpPmCNg3+J8e66Xk8ZQK6yHB81aspDawYnmtt+Rj67M+Clox9dCBR4vZZ9Pm63px1CQ9URC3WnRF7SEmRuOZ1NCZaq8RxZ1QEOaR5ZMGpNlAhdwzhA72cU1z6JjOI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=J5gYtpMT; arc=none smtp.client-ip=209.85.128.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="J5gYtpMT" Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-790884840baso66211777b3.0 for ; Wed, 04 Feb 2026 07:38:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770219517; x=1770824317; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IQXv16HV512qbYg7bqvE7dda3nhbD1riX7k58Uh8FtI=; b=J5gYtpMTq/mSafxZ551ErP9w41VsyklmB0KP6zZCBay29es79skMvuBCYNEjJyC0eE ybog4Dov6zlqkbv1t4cqMRIIjaf04/qyuA0Af8QQqNw9Mu1JJj7TjC6CSBShcoLU6cS9 j3G/oW7GSWssSWVIaAMPLy2Si2oC2XXqJmHqE2aHwOpsracMPtKNzTaqigFNMj9/NTd1 6EM6BeatX8tECkUzKnrdlUVPko/fsTM23KTy3a8dchL6hk71wvBudCqEmrjLnI9Gf3pd esJWRJjYmQEonHe8DRPZOb6TCjF+eNlrowEMXgFvCq0hyQaUqJFMvb1iLbFpg6z0SxJ/ e0Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770219517; x=1770824317; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=IQXv16HV512qbYg7bqvE7dda3nhbD1riX7k58Uh8FtI=; b=vRwZt2sO3MAaUYoq/uvLundtQK/+WSlaaGRoND0jwJBH98pHcSXm+x3W9ybOQ9pfza sscnhRQm7elLqdwVeZnfNkxBayO2vS42ImlONL6sG3k+ZRxUDpDk1UQIXiyv6fPsbMUY V5hpqi8M5n2lS+0NKiQ8cPSqCnyLX2F7PcdyO3nkYAWAu//HNR3n1Th0nqs1l4EOZpst AxgYs1Xtg/FbgBFw+BkE4yh5KbktyiaZfYwvjheNXzOPcWU95jegMDFkaaACuNEJd15s pbGmWiLsdAKsp1uQEGEGiLOn4t7WWx2devhhVIoKd9nm6g47X780mG11a1XoIGNCCAsq 7yWg== X-Forwarded-Encrypted: i=1; AJvYcCWRPJPHotQ9twxd63J8RJiQtY6pvGB3oU/UZb/rSHtnWdMNarWgbLqS9GtxVYh/kigOdP1B2j5lL+ODRlc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0daHy8NjvIq82eMGgbyUVia9LpvgPgI4ifJqXaDPYkBomOYdA wJ+tzHyEKH5kdIJCaxv3jHKi2syLGzhIh6WKJZ5mQaY9MVegqg6UIfRI2ggUCYknRko= X-Gm-Gg: AZuq6aKtAcb31FZL3L9zbgLoxEJQspRcUtUeG/ifMDYifHEgRN5qXgPmtzF4SR4PuWn QTFWUzaotj6w/2mszMXOn8+vrCR/qqAIKainJjz6StKwn6tBqOhgrDcSabasurJNuaPpArpbf4C 8Go4zFUre1lrb+L9V4gNUFpmK4xV8pBiaJFl7fNURz4ybRHVbtieCLi2NpU7Zyyx1WxJzsVxAaZ LCcUpCs3KJ022BcLeYMK6tae3majD9Yc/lM6qS2iSycCopcT6hte0acj/fLGnGh10gvFeCDgRon /dnCSZ2UnDDTAvgk+kAvbZy4Fbf9kBHORYPQPVCd2pDPIFnN9eKEn7BM7eoNDXcBfKs3m2vFigI 2+owkHlai3IA2J5jvFbUPg5/x5tMXLNscCEEpoM+Cxfud+tUVtbY52SUiREEFla28FmX0FkuGrG yl3gXDNLXwWUwtnkIQ8B8PnjWV9j25xldYA1p07HGhz3GkWUvcxoG1ZvcVMi6xv3YMEv6tlxLr8 eQc3cuylQ== X-Received: by 2002:a05:690c:dc7:b0:794:3392:5d64 with SMTP id 00721157ae682-794fe74783bmr34112767b3.44.1770219517080; Wed, 04 Feb 2026 07:38:37 -0800 (PST) Received: from localhost.localdomain (108-214-96-168.lightspeed.sntcca.sbcglobal.net. [108.214.96.168]) by smtp.gmail.com with ESMTPSA id 00721157ae682-794fefedd4bsm23609397b3.48.2026.02.04.07.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 07:38:36 -0800 (PST) From: Sun Jian To: Florian Westphal Cc: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org, linux-kernel@vger.kernel.org, Sun Jian Subject: [PATCH v4 1/5] netfilter: amanda: annotate nf_nat_amanda_hook with __rcu Date: Wed, 4 Feb 2026 23:38:08 +0800 Message-ID: <20260204153812.739799-2-sun.jian.kdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260204153812.739799-1-sun.jian.kdev@gmail.com> References: <20260204153812.739799-1-sun.jian.kdev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The nf_nat_amanda_hook is an RCU-protected pointer but lacks the proper __rcu annotation. Add the annotation to ensure the declaration correctly reflects its usage via rcu_dereference(). Suggested-by: Florian Westphal Signed-off-by: Sun Jian --- include/linux/netfilter/nf_conntrack_amanda.h | 12 ++++++------ net/netfilter/nf_conntrack_amanda.c | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/linux/netfilter/nf_conntrack_amanda.h b/include/linux/= netfilter/nf_conntrack_amanda.h index 6f0ac896fcc9..9f957598a9da 100644 --- a/include/linux/netfilter/nf_conntrack_amanda.h +++ b/include/linux/netfilter/nf_conntrack_amanda.h @@ -7,10 +7,10 @@ #include #include =20 -extern unsigned int (*nf_nat_amanda_hook)(struct sk_buff *skb, - enum ip_conntrack_info ctinfo, - unsigned int protoff, - unsigned int matchoff, - unsigned int matchlen, - struct nf_conntrack_expect *exp); +extern unsigned int (__rcu *nf_nat_amanda_hook)(struct sk_buff *skb, + enum ip_conntrack_info ctinfo, + unsigned int protoff, + unsigned int matchoff, + unsigned int matchlen, + struct nf_conntrack_expect *exp); #endif /* _NF_CONNTRACK_AMANDA_H */ diff --git a/net/netfilter/nf_conntrack_amanda.c b/net/netfilter/nf_conntra= ck_amanda.c index 7be4c35e4795..c0132559f6af 100644 --- a/net/netfilter/nf_conntrack_amanda.c +++ b/net/netfilter/nf_conntrack_amanda.c @@ -37,13 +37,13 @@ MODULE_PARM_DESC(master_timeout, "timeout for the maste= r connection"); module_param(ts_algo, charp, 0400); MODULE_PARM_DESC(ts_algo, "textsearch algorithm to use (default kmp)"); =20 -unsigned int (*nf_nat_amanda_hook)(struct sk_buff *skb, - enum ip_conntrack_info ctinfo, - unsigned int protoff, - unsigned int matchoff, - unsigned int matchlen, - struct nf_conntrack_expect *exp) - __read_mostly; +unsigned int (__rcu *nf_nat_amanda_hook)(struct sk_buff *skb, + enum ip_conntrack_info ctinfo, + unsigned int protoff, + unsigned int matchoff, + unsigned int matchlen, + struct nf_conntrack_expect *exp) + __read_mostly; EXPORT_SYMBOL_GPL(nf_nat_amanda_hook); =20 enum amanda_strings { --=20 2.43.0 From nobody Sat Feb 7 18:15:16 2026 Received: from mail-yw1-f179.google.com (mail-yw1-f179.google.com [209.85.128.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45E4140F8ED for ; Wed, 4 Feb 2026 15:38:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770219521; cv=none; b=OZOEtbAnPtWPU5aQbsW0GJRR/3+yqpP//takBMWqlDXCPaCFv/we/gUGePovG6CqGiFED1kkcIo6GDkIuJnNqVbT7yto8TAB0ADZnqhbAwvkwMPBNrWyXtOni/3Loo6jyRaMl16JSRESh7UtKbXkhpnGz/BXICcN++IdcwVvL3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770219521; c=relaxed/simple; bh=6eRxcKcX/7d4u13eNT9ExdaPC9M+E4rZi+n/Mbmvpto=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oda1l++g4DWyK3M/Qhlfika6cw1m4HDX+prXDrXs1ih9XiohoQC7FQp68ShpW8bRMG6+5xgENkHbBtWs9pOYjY3LS0ktZWnWWcLh0RAzkRfr6EA9SbDdD67ZwRIz7g6crJKQO/4cfdheLpZz8623jnRwgO1q9Qdmqj7K7POVqtA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WKOF0t0c; arc=none smtp.client-ip=209.85.128.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WKOF0t0c" Received: by mail-yw1-f179.google.com with SMTP id 00721157ae682-7927b1620ddso54707b3.0 for ; Wed, 04 Feb 2026 07:38:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770219520; x=1770824320; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r+n47fh2bFXkrYOprTyVzl4j2TOZ+to9r5iYbqmKrvQ=; b=WKOF0t0cDjNYodE/lR0HstzMD4SVx1gJ8WVZpMqVdFaRY19OisBP+dCoKR6YfZ/cXl nH19uAvqptnRMXRLQl2DZHv+oXBh4xBs0MWYlBcYEXMnk5hrM7Qr0dim2ruADqNdkOoE NI4urFYy1AXD7w2CalcEOMUgRKcVsuawI1kPyLhQ/3WKOS7Y2nDObKPtyaOuzG6XKAzn u0Nowqe8vMx79vot0AaSdMarxT4x6Thg0mYZRRMOC2QHgIEEBWHKxQG5kp2Gknck4HG5 /x65D5b7ZmUsr2kfNefoySqxV9bFOCOwelKYnr2hR2gKQz6VDnSYZGFr4WIWQ+3OizaE Hqbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770219520; x=1770824320; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=r+n47fh2bFXkrYOprTyVzl4j2TOZ+to9r5iYbqmKrvQ=; b=TkwjMmvwUQpEP2E9xiyT+Z7hQIJ0HBTsSF5eTb3TGt9K7JUWwjIGHGxsDVnp+9gbms 2sLq37KSr/Qf/Z73lUV8TTp8zb43wn+zRKvLaMWiCPbwnQqfgylnS61hI7Z9iuLsH25z DHM0XMgp0dpiEyNU/OfV6EYXQZG02UepeFy03WAOq3wceO6KADze5uH3prPteN/D57H+ V1ldKIWcoeUCSeZnw8PWTwJHLuxBwiXdlGLD38STPUPMMXGPFlk4HDvAfOJ9Bcvtj3/r XgvEUkxYhK7ReTkB6bm1PRI2zRlZuy8rr1im6xIC3CLjvHxBlnW1EhECu31lCMPnFJeN goXg== X-Forwarded-Encrypted: i=1; AJvYcCWxRhmnsTAGzR9fs6yctcW4wOXL+jzLcm+nYEGHksq6oLyk8FjWqOAPHwnBl5VfVvZmePg0xOPGT3hzfsw=@vger.kernel.org X-Gm-Message-State: AOJu0YxrF2ayWvRjCt3YcSwRzJO/osv54p33cibfzfOIyykv0uAXE0PS /xsuUhWvAmUzZxzHDK6NU5YSMfNhTrSSrp0bD/56Hzq2EsuRD+d0Xtsj X-Gm-Gg: AZuq6aJ5FLj9WaL4q18/x9GALxBWs4wTXi/OEeSgoCThmKOqHY3j6FTTmQ7ts+BI8Gn 5ePoo/XGvXlT3gBseRXTcVU1V4h2vjgpEPoZkcXOGNRpF+s+f8MS58TRl8RQGCNF2Oqc+37A1YJ NEoVLZkIgqXJxCoCvPhsD3N+klBoaFONpef5u6tERkjVabeWgPIu3KRJqsIe5ZZ/ObkalKxtBe2 9z47wtYA0+mCzYstI3dg27CYsmeoCbFaCUVYgFtpXgsbNijwRcSvZo6NGvJGgAMSIYcr0I/M/rU rY2OJPtI8zYas9aghrkNfonZ7tLVDHIYptRl6QCGN7y3urBbpZ/J6VO6iQ1tTMeNlWjrfIXh25C rXseCiQGaxyYi1Y4njtXxYgES6nYIMyr3DI+ncoUnZaqflQkc3TmOaxsSAaodXXLUPjlJ78Sk1P 6Md0qFwzuVoQKxweaK7Tw67nu32ro/RNyrZfW+BKSnekxFT0OGl9wzJsL7Pi1UVcd9WCEIeypHk WyJJohDnEx+8DQpJxM/ X-Received: by 2002:a05:690c:6d0a:b0:795:905:c047 with SMTP id 00721157ae682-7950905c920mr12338527b3.3.1770219520334; Wed, 04 Feb 2026 07:38:40 -0800 (PST) Received: from localhost.localdomain (108-214-96-168.lightspeed.sntcca.sbcglobal.net. [108.214.96.168]) by smtp.gmail.com with ESMTPSA id 00721157ae682-794fefedd4bsm23609397b3.48.2026.02.04.07.38.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 07:38:40 -0800 (PST) From: Sun Jian To: Florian Westphal Cc: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org, linux-kernel@vger.kernel.org, Sun Jian Subject: [PATCH v4 2/5] netfilter: ftp: annotate nf_nat_ftp_hook with __rcu Date: Wed, 4 Feb 2026 23:38:09 +0800 Message-ID: <20260204153812.739799-3-sun.jian.kdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260204153812.739799-1-sun.jian.kdev@gmail.com> References: <20260204153812.739799-1-sun.jian.kdev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The nf_nat_ftp_hook is an RCU-protected pointer but lacks the proper __rcu annotation. Add the annotation to ensure the declaration correctly reflects its usage via rcu_dereference(). Suggested-by: Florian Westphal Signed-off-by: Sun Jian --- include/linux/netfilter/nf_conntrack_ftp.h | 2 +- net/netfilter/nf_conntrack_ftp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/netfilter/nf_conntrack_ftp.h b/include/linux/net= filter/nf_conntrack_ftp.h index 0e38302820b9..f31292642035 100644 --- a/include/linux/netfilter/nf_conntrack_ftp.h +++ b/include/linux/netfilter/nf_conntrack_ftp.h @@ -26,7 +26,7 @@ struct nf_ct_ftp_master { =20 /* For NAT to hook in when we find a packet which describes what other * connection we should expect. */ -extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff *skb, +extern unsigned int (__rcu *nf_nat_ftp_hook)(struct sk_buff *skb, enum ip_conntrack_info ctinfo, enum nf_ct_ftp_type type, unsigned int protoff, diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_= ftp.c index 617f744a2e3a..74811893dec4 100644 --- a/net/netfilter/nf_conntrack_ftp.c +++ b/net/netfilter/nf_conntrack_ftp.c @@ -43,7 +43,7 @@ module_param_array(ports, ushort, &ports_c, 0400); static bool loose; module_param(loose, bool, 0600); =20 -unsigned int (*nf_nat_ftp_hook)(struct sk_buff *skb, +unsigned int (__rcu *nf_nat_ftp_hook)(struct sk_buff *skb, enum ip_conntrack_info ctinfo, enum nf_ct_ftp_type type, unsigned int protoff, --=20 2.43.0 From nobody Sat Feb 7 18:15:16 2026 Received: from mail-yw1-f169.google.com (mail-yw1-f169.google.com [209.85.128.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E204E41C305 for ; Wed, 4 Feb 2026 15:38:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770219525; cv=none; b=LYN71IvflFEn/QqDPcCyryij5UkX0rs+uv43UIT4aFnNAdPyXzZazCnADrmCRIUGa3hdS+nkfJhvFv1PXZ8xxB5oy1BaMnHQe5+ux1yzr3zVHYF7/7P4fZgasU6OM2WaRbW7B8HfNHi6Tp889Dh/LOJCxVkJH/gYVYDE6CjrXWA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770219525; c=relaxed/simple; bh=NBuh1dvBgiNH87qE3r1Qm60QPkpoCG2hUsKeZNts0C4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ts20Qm0f+RU43+r6YGiPQudFncQsjpfw6Rwlz1wz7hIFJ9omkOknh/fihsKzcB/iFu4mP/jjq8LjSO4Z+Vz3RsGYP622XqNu9TP766VGUKGR1alo4Xy9XqCf3LD4/Vp2L3X2ClWXKEpZqjdUqGo3HlSUVU6TD1bFgEmGvYAvoTM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KGpdg9RO; arc=none smtp.client-ip=209.85.128.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KGpdg9RO" Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-794911acb04so69092547b3.0 for ; Wed, 04 Feb 2026 07:38:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770219524; x=1770824324; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xPqJuHpEvwCCDtvNN9VeUm4XD5r0IJyrLWkforP5Mn0=; b=KGpdg9ROD1eugZfGRs9vr2gMLYPZ/eozApqJficeLADgIHBpYro2bOBw2/UGoBU8sm DIciYm+liuz8vz9iYT84iDz7/Isz5dlc4CpuxSyn6U7kJtuutQAy6ER4pL5rTCN5tGhx bSw9HBy/70NNpjbU8zsjq0dRL6bgc4T9Vd9gJA0pwz6SkUg/HuaqRW1qWKoUJU1ddJKJ qIg3lfgjoWmBeBgRTqnIn5XjCj27TraXqsKgmwDH9zSzeK8UfT/RqVDQFbYTP+UTI1jp bStsOcB6jzFjskqlgfHwfbtSOKJRQQKys5E4ZN7FdJcjZMKk1nBrAF5sFfPA4t0bgwjX 3bOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770219524; x=1770824324; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xPqJuHpEvwCCDtvNN9VeUm4XD5r0IJyrLWkforP5Mn0=; b=qEQXoJMjlAiH4RbCvjiXE8e/NXmB9nKaJaOxkD/yWDe1Mj3MWCFPiwi3gfyGtgNE76 cPZPE2kiQ89Gl68dgMt4ASdTtMhI6eXO5qkZ9Rf2EiIA3YS1rPcvC8oHw19EGywBflTX TOZroeYlLCtBKx9H6cKb4CpvMZzXiUV1K+8vsTuJhYobzJCfstlWTlcTDCtPtyEQ5UxE 3y2ooovQESypkTLFWImc6TyIEM1ske1M0q9NatQPPJExTABwtU0xMommpvsEM22YOlWq V0A8UE4a2kL/Kddo+R0tpztsGGJrRkNMfwAYf0V8fT4CLORlKhLiO7EtAsTFyOXAm9+b vO3w== X-Forwarded-Encrypted: i=1; AJvYcCWNlQJ31nwYkk9agKWrVqA0E3pjxNSU3t8GfGAPVQiAwPh9ATLwUWhl322ft5HqiQo9i3v18J+H4AjeGgY=@vger.kernel.org X-Gm-Message-State: AOJu0YzqjGApSXrrkKqzYuNi02AGFlt2jplbd3e4a9kbhi9LBDFgmX0q MZnTTiygGogqCkM2KQkjK2Ej2Tkw4PfgVOQy7sjdKXpq/lsgoPOptfLb X-Gm-Gg: AZuq6aIXAQp1yHMqqwIfaJNfqWORuSH9trWHl4J+7Bz1sBU9HwGiOMSoRiCZT/Kzw25 pN0oyzIOhCzSWQYAvkffmosf470w4p4rvke0ykuMT/2qOUzyVU5OBFDyVqleUMJ8ZLl/7Z3GEoC ZoVsp/vUMKPi6V0ueaVa4LFaNkAwLMI7rRR5SWxC5bd2P95HoKtkWqSxLZH9G5B42IhuikZmptN i3oSDmio743MSCk8345LYpi1q51Nd7nGfUveVHTjBfHffD0E8sakP9X9nfjDY1NZRsWykhwRRv0 LnPSmiGG9eWQPNg9S+Bfk7u1/6qTJ+y/7ljvFpaUMVCRuFrtY4AtwtRQKKCtt7t2ipkjeIMM8O6 4U4EY03DemHDwlS0DJmx0mNazKlV6k/yRNjmOMYgy3VgjIq8BPT0GgDwtdomdUy4ZiVynv6zRmO RJLp2VWK3IqmnSAUubTv5stpVPU45V16/5quPhIBwzpYoDp2qaVS3KT+OlxRGCm6k9fg4TnEE+w ULUfZqL0bwuhwfcFPGr X-Received: by 2002:a05:690c:97:b0:794:8055:7f68 with SMTP id 00721157ae682-794fe696cc8mr35059667b3.26.1770219523651; Wed, 04 Feb 2026 07:38:43 -0800 (PST) Received: from localhost.localdomain (108-214-96-168.lightspeed.sntcca.sbcglobal.net. [108.214.96.168]) by smtp.gmail.com with ESMTPSA id 00721157ae682-794fefedd4bsm23609397b3.48.2026.02.04.07.38.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 07:38:43 -0800 (PST) From: Sun Jian To: Florian Westphal Cc: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org, linux-kernel@vger.kernel.org, Sun Jian Subject: [PATCH v4 3/5] netfilter: irc: annotate nf_nat_irc_hook with __rcu Date: Wed, 4 Feb 2026 23:38:10 +0800 Message-ID: <20260204153812.739799-4-sun.jian.kdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260204153812.739799-1-sun.jian.kdev@gmail.com> References: <20260204153812.739799-1-sun.jian.kdev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The nf_nat_irc_hook is an RCU-protected pointer but lacks the proper __rcu annotation. Add the annotation to ensure the declaration correctly reflects its usage via rcu_dereference(). Suggested-by: Florian Westphal Signed-off-by: Sun Jian --- include/linux/netfilter/nf_conntrack_irc.h | 2 +- net/netfilter/nf_conntrack_irc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/netfilter/nf_conntrack_irc.h b/include/linux/net= filter/nf_conntrack_irc.h index d02255f721e1..4f3ca5621998 100644 --- a/include/linux/netfilter/nf_conntrack_irc.h +++ b/include/linux/netfilter/nf_conntrack_irc.h @@ -8,7 +8,7 @@ =20 #define IRC_PORT 6667 =20 -extern unsigned int (*nf_nat_irc_hook)(struct sk_buff *skb, +extern unsigned int (__rcu *nf_nat_irc_hook)(struct sk_buff *skb, enum ip_conntrack_info ctinfo, unsigned int protoff, unsigned int matchoff, diff --git a/net/netfilter/nf_conntrack_irc.c b/net/netfilter/nf_conntrack_= irc.c index 5703846bea3b..76c007530b3c 100644 --- a/net/netfilter/nf_conntrack_irc.c +++ b/net/netfilter/nf_conntrack_irc.c @@ -30,7 +30,7 @@ static unsigned int dcc_timeout __read_mostly =3D 300; static char *irc_buffer; static DEFINE_SPINLOCK(irc_buffer_lock); =20 -unsigned int (*nf_nat_irc_hook)(struct sk_buff *skb, +unsigned int (__rcu *nf_nat_irc_hook)(struct sk_buff *skb, enum ip_conntrack_info ctinfo, unsigned int protoff, unsigned int matchoff, --=20 2.43.0 From nobody Sat Feb 7 18:15:16 2026 Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B493141B346 for ; Wed, 4 Feb 2026 15:38:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770219531; cv=none; b=h+oWIyrU7d3AuI8nJAVvdEuM/pevzVzp6eEftJXHSta3r95FGFXxbsC1dL4M/OBTULI3MV1qEpJSUsVLfDdzaX5IKNvrQWF2rKwoZbsCqAvgHK7Ik8viCMriv9FNibPdbIwfqhHyBnIbBs3jx48zY+7Ra15ECTymL8iDH5dsxOM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770219531; c=relaxed/simple; bh=VvZrFUse2WKkW09+aZ0530UxKnUHy2lCsYRmqdrLs4E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mOFtZhy1+M7Y/+cQlHpcO02HTC6Y3XfMSSRpV3oFjdc9RWkjE8JSS0UePIyIhBcYo+LYLklhz0rlyJkqy6ccA8dXEHN+FBCbnuPHkxVxS/Z52YjItDDdIT58NuTUOudivBx2bdWD4cy9f2w0EwARzxblZr3/g5rPhuC+pOEpv1w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GQTmFKdi; arc=none smtp.client-ip=209.85.128.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GQTmFKdi" Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-794c2db2ee5so45364177b3.2 for ; Wed, 04 Feb 2026 07:38:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770219531; x=1770824331; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TKy1kRyVzTZS/2OsQ960jMKveDH4L95qBQ+tdJbKvvs=; b=GQTmFKdiFKbbY2wNw43o+jvgiscveU0fTMRg4aT9aXgNrnW8+rHANX6rUXKSZHOU36 yPcCbnbxJf96YjH89WtK+IAhzXVpIZk4wRiXSyBpD/wIgqW+YWQzPUqV+6cVhvyqMEK4 LJxui+t4Pz1hCk+VE9yCKjVRtbv5hBCMXXB6CjIfTE7eOLSGGRWVGI6mr5nyJKBHNXMM S+VO7aQnYI2a1jtpZmSew7qp07+FFp1JWb2Gke/JTCplBWxIzdH3PaaRGgq6xTG1lfXS ZtRMl6CEGFMh0yKRrLzTLJXxy7eb1gqpfHm/q8IxJf7YG5oLWKUiwFZh/PsErtJNVWyo xv+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770219531; x=1770824331; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TKy1kRyVzTZS/2OsQ960jMKveDH4L95qBQ+tdJbKvvs=; b=iDTMK6eHrTMlFUhESbYr0pU7/EASdMNe176uDveu/woKA7ViJEeuWQmmSOXKciCOi9 t18dWRRXC2pqLIrfaQ8y2rXOSe4MoL3TGs4m3/fYjtJO4c75496zQfwBPK/wFaHGBLeL rV5643MjxkfsKi6n883h/PTGhTDmq9wXXuK0kb+bMo4H9S/MRH3MCUJCQ2ixVXgnjgUp TRgYw/FQEcpQ6Fiz8YikhupnoDupKumKH4wjwvjXiPscl9e+kSfdAjib+0TYLjVObRfY 9WOVlVcNQm3//zOJHLM/yhA8t6RCQOwPyraXsfRyMBDhXe9FfErEnQHZJptfExwJ17HG mzLA== X-Forwarded-Encrypted: i=1; AJvYcCU+HGFoBPC2siosKnogzw2zVJyJLGzAkL+gQdqx1tRiunluph+1l0HlbM43S2eufKiuTSqjf8lrHT0/Onw=@vger.kernel.org X-Gm-Message-State: AOJu0Yzdm2VvP0T7yervufenH861VcbvBr7idhbn9OJakQPuEZSA41+Z 2QI8yX+mlMl6somFk4rGcrXv4R/yPqRDQZ7JvFCnOTAoJZ7Ri/eeeJk5 X-Gm-Gg: AZuq6aL5HX1oiQTI7MK/xSaGnuA3IR5rIMAqHky/NLcn1LdkyYl2/HZdFJCmVdNQj+H oIIa38XjsysXOAHyg34LZpyE0jx7Nk3/cxCkjNcFUH5J3E3mNWq4O6fXFlSZMG7A0Jnk5AuYEPI 9in5XL0NlBodaG/v2ijhjzL5cJLdYsRAASKyIjgVSrdGH9T244+OYpZr8q8zaU3X066baH7m4k2 xHy5dJakQTrstJywoSW+RojmeCm0kCM04YtXFeUHQnKeon2LWVuJIZYoOABNGBP5gkSSGs6jLyG 9pRCYD1TkHtoeCyhB8ZXTWglOYkgufmcdBuCt3h3KiIE/hs5h6BaR64smJKmU+rtRngaEyw4vV7 aAhgltCBD4nasLNRpb5rSTi6Cg0LBup9/avGyNuqtU3ix+9cJ8TX054/jZDS9/GTXxaKfVMQXhI Z16E8azGQgE33XcRPQWQLEu02nQr8Xjzi9pzXP1DbSiYhDhHYodG/d07BMtv1ACyx7JkXjI0657 wfHR8l0Yg== X-Received: by 2002:a05:690c:1e:b0:794:5ac:a9e1 with SMTP id 00721157ae682-794fe87d8e0mr32891587b3.65.1770219530827; Wed, 04 Feb 2026 07:38:50 -0800 (PST) Received: from localhost.localdomain (108-214-96-168.lightspeed.sntcca.sbcglobal.net. [108.214.96.168]) by smtp.gmail.com with ESMTPSA id 00721157ae682-794fefedd4bsm23609397b3.48.2026.02.04.07.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 07:38:50 -0800 (PST) From: Sun Jian To: Florian Westphal Cc: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org, linux-kernel@vger.kernel.org, Sun Jian Subject: [PATCH v4 4/5] netfilter: snmp: annotate nf_nat_snmp_hook with __rcu Date: Wed, 4 Feb 2026 23:38:11 +0800 Message-ID: <20260204153812.739799-5-sun.jian.kdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260204153812.739799-1-sun.jian.kdev@gmail.com> References: <20260204153812.739799-1-sun.jian.kdev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The nf_nat_snmp_hook is an RCU-protected pointer but lacks the proper __rcu annotation. Add the annotation to ensure the declaration correctly reflects its usage via rcu_dereference(). Suggested-by: Florian Westphal Signed-off-by: Sun Jian --- include/linux/netfilter/nf_conntrack_snmp.h | 2 +- net/netfilter/nf_conntrack_snmp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/netfilter/nf_conntrack_snmp.h b/include/linux/ne= tfilter/nf_conntrack_snmp.h index 87e4f33eb55f..99107e4f5234 100644 --- a/include/linux/netfilter/nf_conntrack_snmp.h +++ b/include/linux/netfilter/nf_conntrack_snmp.h @@ -5,7 +5,7 @@ #include #include =20 -extern int (*nf_nat_snmp_hook)(struct sk_buff *skb, +extern int (__rcu *nf_nat_snmp_hook)(struct sk_buff *skb, unsigned int protoff, struct nf_conn *ct, enum ip_conntrack_info ctinfo); diff --git a/net/netfilter/nf_conntrack_snmp.c b/net/netfilter/nf_conntrack= _snmp.c index daacf2023fa5..34f6624fbcfb 100644 --- a/net/netfilter/nf_conntrack_snmp.c +++ b/net/netfilter/nf_conntrack_snmp.c @@ -25,7 +25,7 @@ static unsigned int timeout __read_mostly =3D 30; module_param(timeout, uint, 0400); MODULE_PARM_DESC(timeout, "timeout for master connection/replies in second= s"); =20 -int (*nf_nat_snmp_hook)(struct sk_buff *skb, +int (__rcu *nf_nat_snmp_hook)(struct sk_buff *skb, unsigned int protoff, struct nf_conn *ct, enum ip_conntrack_info ctinfo); --=20 2.43.0 From nobody Sat Feb 7 18:15:16 2026 Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 854A941B346 for ; Wed, 4 Feb 2026 15:38:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770219536; cv=none; b=HGcGk8Cj6crtz9zHyOjNNUIJShISHYepwXyuym0yQDY9gELF0nv8QAx7TR3xax+Dh/fdnKtLtopt+pLBc2qkgr7JoQ0OfkyMqiaLlOGBiF1q1SQ8vaqXsBx+copx3G+lZ4D31UPwEnUpfUcuTORnUdNLOY/63SCm2kZhjEO0EAw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770219536; c=relaxed/simple; bh=b7WkUfdl7cNyd3rvs28XPRl7naD0eLIJrTKWlrRDrgg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A9mSiEUyvfq5fSXBaan+KztuW6X/qyK4BkZctYmwXgq5i4KVahGWbq/tJaBvXQq1SvzuHUExAPgPjTvfoTZCWBhWPX5PwAS/eYo6MO4L9+rcO45y1lQ9GUmk8ONqUqMNR/l/CGvdE/yoeI3UImLnqx1UpxDB+Pb8jYFf6ywxxhg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CENDczjO; arc=none smtp.client-ip=209.85.128.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CENDczjO" Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-7950881727cso4611167b3.3 for ; Wed, 04 Feb 2026 07:38:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770219536; x=1770824336; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=h/5SD8AXq32EOZXgCdiUpBHAXtYnBkcl9u7VsKej7wE=; b=CENDczjOxUCq6yKjcR54oD4sHPsYVf7ssLMzx0Ud8wS2jfHnrRD2VRg5kluR8ICSAO xDBtxx8Dr1dwYTqH0wfMBC08rjCrJ3aC5GQ4MAz98OpmTHxSD9FLsy21t0tIHgX2C8nI Ufs5ozDAvG1Y5jpdUpDlBRLCkeT3jMZd80PifPxwNAIMznPVecK6Trgbfj/k9DrQvnEn sjrcKUfVGm2Bt4QChEGs9UbHkTJwKqw9CfVA5P7u+utES7wy1BQw2YPQFcWLmakBCgYq VTJOxqQsKQgYYqLI3ryCVPcvpB3mzujmOEt5JNuHN2HZGDScUBs1eaIJ7mvC75Pvc9Ou cuuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770219536; x=1770824336; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=h/5SD8AXq32EOZXgCdiUpBHAXtYnBkcl9u7VsKej7wE=; b=HstrxcFhhRd3pendurL1opKz9Po6Vof0ks7Xr5JT5d1TZQT1WG9opHwfFlu6b6bxZW CmeHd2qwBZ7rwG1gcsMXMOq3Viwo0Wg/8IphEJqaoSmMrHl3QjcAc3UcJIE6EWMGFavI blU+htV0fKKArDjfT6P0MQ7TKqbq1kLco+UzuD4It1pkI/3HKJiwLMIVVCDNSelXqGuX j4qyJwcIC5A4301ccYnh+V6K3gVlbVKq985KjKfY9wrYHH+HT4/cnb3/dJYuKgyEwfHX TDZoNO6815KaGVjGd72f4h7gYMqYhm8na6Y7ariC87hZ1WZpL7qUT1Ah3e9+nsT8XuWH 8KSw== X-Forwarded-Encrypted: i=1; AJvYcCVBydt7YBNQ2GmJrQ0HBBgpoWJZou3RunnbiOVXq7jTiPwLgRSjF+kZ6iXUm2ax1kF7z3OsdTSrvKaWpvI=@vger.kernel.org X-Gm-Message-State: AOJu0Ywcg/h1tBgrA7LzvZ5U3OIFuQVIHTWOuhOciB1/Yk8LNHv0df3x nU9mp1zIIVzUTW17XaqgubSQlDq5v2nHWtqKTxSe9sej/2l5scxKSM2kT4RKawFSeQQ= X-Gm-Gg: AZuq6aLW41UbOmcdDcZt9uKYhjoq/+nl3mcb39Icpl4HUOW+M86gEIWWQ7r4DpY2OKk 6SXpwY7bKQ+hnlCpsR28c4Bmgd0VudboMML1aZQprPKkTXzIlp3EkjqkON7F9Zy3YjAFh3yKumJ 5YGa0ki1VLAKJFdDXeW+6Em/VX/aiNe7e4+/IFO0nrVPoZPpRqCJ1owH5+SNdled6WgTeIwEmDs HX9wDH40GHE4kkex7nNhbuM6AKb6gcJZ3hQaBMuDYI9MVfiPv9ZbKlxp5ZdOSegHGrRQj8dqYjH 7Y8i9MhqKRIi6IL1zIYn2+JIMfdL2oDvelyyrX01a3QJsPPQh7JFr/dXpy5BB6SXhcYmWTwF3v4 89DPxnS1C8HVlRzX+/xpZPynztVbQeJC1BfHTOXzQ2slfJjmyjl7yEjNsBBF41p+jZvmbw7og7+ tOtBzWsZvQNhHpMQpvd7U7DZqACZOW3T2iDS/0/2prgxd3fnorZu6X1mRHI8q1UrrDWhi9j80Ma 9iXLqq7y1HAU4gG+yQX X-Received: by 2002:a05:690c:39b:b0:794:ef94:1222 with SMTP id 00721157ae682-794fe7a13f5mr68835017b3.55.1770219535570; Wed, 04 Feb 2026 07:38:55 -0800 (PST) Received: from localhost.localdomain (108-214-96-168.lightspeed.sntcca.sbcglobal.net. [108.214.96.168]) by smtp.gmail.com with ESMTPSA id 00721157ae682-794fefedd4bsm23609397b3.48.2026.02.04.07.38.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 07:38:55 -0800 (PST) From: Sun Jian To: Florian Westphal Cc: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org, linux-kernel@vger.kernel.org, Sun Jian Subject: [PATCH v4 5/5] netfilter: tftp: annotate nf_nat_tftp_hook with __rcu Date: Wed, 4 Feb 2026 23:38:12 +0800 Message-ID: <20260204153812.739799-6-sun.jian.kdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260204153812.739799-1-sun.jian.kdev@gmail.com> References: <20260204153812.739799-1-sun.jian.kdev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The nf_nat_tftp_hook is an RCU-protected pointer but lacks the proper __rcu annotation. Add the annotation to ensure the declaration correctly reflects its usage via rcu_dereference(). Suggested-by: Florian Westphal Signed-off-by: Sun Jian --- include/linux/netfilter/nf_conntrack_tftp.h | 2 +- net/netfilter/nf_conntrack_tftp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/netfilter/nf_conntrack_tftp.h b/include/linux/ne= tfilter/nf_conntrack_tftp.h index dc4c1b9beac0..1490b68dd7d1 100644 --- a/include/linux/netfilter/nf_conntrack_tftp.h +++ b/include/linux/netfilter/nf_conntrack_tftp.h @@ -19,7 +19,7 @@ struct tftphdr { #define TFTP_OPCODE_ACK 4 #define TFTP_OPCODE_ERROR 5 =20 -extern unsigned int (*nf_nat_tftp_hook)(struct sk_buff *skb, +extern unsigned int (__rcu *nf_nat_tftp_hook)(struct sk_buff *skb, enum ip_conntrack_info ctinfo, struct nf_conntrack_expect *exp); =20 diff --git a/net/netfilter/nf_conntrack_tftp.c b/net/netfilter/nf_conntrack= _tftp.c index 80ee53f29f68..c6d8c2e80661 100644 --- a/net/netfilter/nf_conntrack_tftp.c +++ b/net/netfilter/nf_conntrack_tftp.c @@ -32,7 +32,7 @@ static unsigned int ports_c; module_param_array(ports, ushort, &ports_c, 0400); MODULE_PARM_DESC(ports, "Port numbers of TFTP servers"); =20 -unsigned int (*nf_nat_tftp_hook)(struct sk_buff *skb, +unsigned int (__rcu *nf_nat_tftp_hook)(struct sk_buff *skb, enum ip_conntrack_info ctinfo, struct nf_conntrack_expect *exp) __read_mostly; EXPORT_SYMBOL_GPL(nf_nat_tftp_hook); --=20 2.43.0