From: Jeff Layton <jlayton@kernel.org>
To: Chuck Lever <cel@kernel.org>, NeilBrown <neil@brown.name>,
Olga Kornievskaia <okorniev@redhat.com>,
Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>,
Trond Myklebust <trondmy@kernel.org>,
Anna Schumaker <anna@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
Shuah Khan <shuah@kernel.org>
Cc: Slawomir Stepien <sst@poczta.fm>,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, Trond Myklebust <trondmy@gmail.com>,
linux-kselftest@vger.kernel.org,
Jeff Layton <jlayton@kernel.org>
Subject: [PATCH v5 01/15] NFSD: cap the number of listeners accepted in listener_set
Date: Tue, 01 Sep 2026 09:39:39 -0400 [thread overview]
Message-ID: <20260901-nfsd-nl-hang-v5-1-a540d86668b0@kernel.org> (raw)
In-Reply-To: <20260901-nfsd-nl-hang-v5-0-a540d86668b0@kernel.org>
nfsd_nl_listener_set_doit() matches each requested listener against the
existing set. The nested loop that does this is O(N * M), where N is the
requested count and M is the existing count. The loop runs under sv_lock
with bottom halves disabled. A userland request with a very large listener
list can therefore spin in atomic context for a long time.
Reject a request that carries more than NFSD_NL_LISTENER_MAX (1024)
entries. The check goes in nfsd_nl_validate_listeners(), before the code
takes any lock. The limit is far above any realistic configuration.
This patch does not cap M. Only the message size bounded N; real sockets
bound M. A listener_set result set is the requested set, so that path also
holds M at the cap, but __write_ports_addxprt() adds two listeners per call
and removes none, so repeated calls can push M past it. The worst case
under sv_lock is therefore 1024 * M, plus 1024 nla_parse_nested() calls.
Both interfaces require CAP_NET_ADMIN.
Fixes: 16a471177496 ("NFSD: add listener-{set,get} netlink command")
Assisted-by: LLM
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/nfsd/nfsctl.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 5331b89c4281..b6f4d66f612a 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1995,21 +1995,22 @@ int nfsd_nl_version_get_doit(struct sk_buff *skb, struct genl_info *info)
return err;
}
+/* Upper bound on the number of listeners a single request may carry. */
+#define NFSD_NL_LISTENER_MAX 1024
+
/**
* nfsd_nl_validate_listeners - sanity-check the listener list from userland
* @info: netlink metadata and command arguments
*
- * Walk every NFSD_A_SERVER_SOCK_ADDR attribute and confirm that each entry
- * is well-formed: it parses against the policy, carries both an address and
- * a transport name, and the address is long enough for its family. Doing
- * this up front lets the callers below assume every entry is valid and
- * guarantees we make no changes when the request is malformed.
+ * Walk every NFSD_A_SERVER_SOCK_ADDR attribute and confirm that the list is
+ * not oversized and that each entry is well-formed.
*
* Return: 0 if every entry is valid, or a negative errno otherwise.
*/
static int nfsd_nl_validate_listeners(struct genl_info *info)
{
const struct nlattr *attr;
+ unsigned int count = 0;
int rem;
nlmsg_for_each_attr_type(attr, NFSD_A_SERVER_SOCK_ADDR, info->nlhdr,
@@ -2018,6 +2019,11 @@ static int nfsd_nl_validate_listeners(struct genl_info *info)
struct sockaddr *sa;
int err;
+ if (++count > NFSD_NL_LISTENER_MAX) {
+ NL_SET_ERR_MSG(info->extack, "too many listeners");
+ return -E2BIG;
+ }
+
err = nla_parse_nested(tb, NFSD_A_SOCK_MAX, attr,
nfsd_sock_nl_policy, info->extack);
if (err < 0)
--
2.55.0
next prev parent reply other threads:[~2026-09-01 13:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-01 13:39 [PATCH v5 00/15] nfsd/sunrpc: harden the netlink listener set interface Jeff Layton
2026-09-01 13:39 ` Jeff Layton [this message]
2026-09-01 13:39 ` [PATCH v5 02/15] NFSD: validate transport name in listener_set before serv creation Jeff Layton
2026-09-01 13:39 ` [PATCH v5 03/15] SUNRPC: keep the first error in svc_register() Jeff Layton
2026-09-01 13:39 ` [PATCH v5 04/15] SUNRPC: bound the local rpcbind client timeout to 1s Jeff Layton
2026-09-01 13:39 ` [PATCH v5 05/15] NFSD: report listener creation failures through extack Jeff Layton
2026-09-01 13:39 ` [PATCH v5 06/15] SUNRPC: report local rpcbind calls that get no answer Jeff Layton
2026-09-01 13:39 ` [PATCH v5 07/15] SUNRPC: stop svc_register() once rpcbind stops answering Jeff Layton
2026-09-01 13:39 ` [PATCH v5 08/15] SUNRPC: stop the svc_unregister() sweep " Jeff Layton
2026-09-01 13:39 ` [PATCH v5 09/15] SUNRPC: stop unregistering listeners " Jeff Layton
2026-09-01 13:39 ` [PATCH v5 10/15] NFSD: stop registering with rpcbind after a failure in listener_set Jeff Layton
2026-09-01 13:39 ` [PATCH v5 11/15] SUNRPC: check rpc_sockaddr2uaddr() for failure when registering Jeff Layton
2026-09-01 13:39 ` [PATCH v5 12/15] selftests/nfsd: exercise listener_set request validation Jeff Layton
2026-09-01 13:39 ` [PATCH v5 13/15] selftests/nfsd: add a per-netns rpcbind stub and the listener round-trips Jeff Layton
2026-09-01 13:39 ` [PATCH v5 14/15] selftests/nfsd: check that listener_set asks rpcbind once Jeff Layton
2026-09-01 13:39 ` [PATCH v5 15/15] selftests/nfsd: check that listener removal " Jeff Layton
2026-09-02 13:59 ` [PATCH v5 00/15] nfsd/sunrpc: harden the netlink listener set interface Chuck Lever
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260901-nfsd-nl-hang-v5-1-a540d86668b0@kernel.org \
--to=jlayton@kernel.org \
--cc=Dai.Ngo@oracle.com \
--cc=anna@kernel.org \
--cc=cel@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neil@brown.name \
--cc=netdev@vger.kernel.org \
--cc=okorniev@redhat.com \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
--cc=sst@poczta.fm \
--cc=tom@talpey.com \
--cc=trondmy@gmail.com \
--cc=trondmy@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox