sunrpc: pin gss module across auth_domain RCU free
Subsystems (3)
Chuck Lever
maintainerPATCH 1/1 sunrpc: pin gss module across auth_domain RCU free
From: Chris Mason <[email protected]>
A gss auth_domain stores a raw pointer to svcauthops_gss in dom->flavour, and its release queues svcauth_gss_domain_release_rcu() via call_rcu(). Both live in auth_rpcgss.ko text, and nothing pins the module while a domain referencing it is reachable. rmmod auth_rpcgss can therefore unmap that text while an NFSD export still holds a reference to the domain.
The export cache is one such holder. When the export is finally released, the domain reference drops from module text:
svc_export_put()
auth_domain_put(exp->ex_client)
auth_domain_release()
dom->flavour->domain_release(dom) /* into module text */
svcauth_gss_domain_release()
call_rcu(&dom->rcu_head,
svcauth_gss_domain_release_rcu)Once auth_rpcgss is unloaded, the domain_release call lands in unmapped memory. The rcu_barrier() in exit_rpcsec_gss() does not
help: it waits only for callbacks already queued, and this one is not queued until the export goes away.
NFSD's NFSv4 objects import symbols from auth_rpcgss.ko, so only a server built without CONFIG_NFSD_V4 can unload auth_rpcgss while exports still name a gss domain.
Take a module reference in svcauth_gss_register_pseudoflavor() before publishing the domain and drop it at the end of svcauth_gss_domain_release_rcu(). The rcu_barrier() then holds the module image until this callback has returned.
--- net/sunrpc/auth_gss/svcauth_gss.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/sunrpc/auth_gss/svcauth_gss.c +8 -0
@@ -824,12 +824,18 @@ svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name) new->h.flavour = &svcauthops_gss; new->pseudoflavor = pseudoflavor; +if (!try_module_get (svcauthops_gss.owner)) { + stat = -ENODEV ; + goto out_free_name; + } + test =auth_domain_lookup (name, &new->h);if (test != &new->h) {pr_warn ("svc: duplicate registration of gss pseudo flavour %s.\n" , name); stat = -EADDRINUSE ;auth_domain_put (test); +module_put (svcauthops_gss.owner); goto out_free_name; }return test;
@@ -2004,9 +2010,11 @@ svcauth_gss_domain_release_rcu(struct rcu_head *head) { struct auth_domain *dom = container_of(head, struct auth_domain, rcu_head); struct gss_domain *gd = container_of(dom, struct gss_domain, h); +struct module *owner = dom->flavour->owner;kfree (dom->name);kfree (gd); +module_put (owner); } static void
Signature · 1 line
2.55.0
Quoted 68 lines · Chuck Lever
From: Chris Mason <[email protected]>
A gss
auth_domainstores a raw pointer tosvcauthops_gssindom->flavour, and its release queuessvcauth_gss_domain_release_rcu()viacall_rcu(). Both live in auth_rpcgss.ko text, and nothing pins the module while a domain referencing it is reachable. rmmodauth_rpcgsscan therefore unmap that text while an NFSD export still holds a reference to the domain.The export cache is one such holder. When the export is finally released, the domain reference drops from module text:
svc_export_put() auth_domain_put(exp->ex_client) auth_domain_release() dom->flavour->domain_release(dom) /* into module text */ svcauth_gss_domain_release() call_rcu(&dom->rcu_head, svcauth_gss_domain_release_rcu)Once
auth_rpcgssis unloaded, thedomain_releasecall lands in unmapped memory. Thercu_barrier()inexit_rpcsec_gss()does not
help: it waits only for callbacks already queued, and this one is not queued until the export goes away.NFSD's NFSv4 objects import symbols from auth_rpcgss.ko, so only a server built without
CONFIG_NFSD_V4can unloadauth_rpcgsswhile exports still name a gss domain.Take a module reference in
svcauth_gss_register_pseudoflavor()before publishing the domain and drop it at the end ofsvcauth_gss_domain_release_rcu(). Thercu_barrier()then holds the module image until this callback has returned.Fixes 608a0ab2f54a ("SUNRPC: Add lockless lookup of the server's auth domain")Assisted-by kres:claude-opus-4-7Signed-off-by Chris Mason <[email protected]>[ cel: rewrote description ]Signed-off-by Chuck Lever <[email protected]>--- net/sunrpc/auth_gss/svcauth_gss.c | 8 ++++++++ 1 file changed, 8 insertions(+)net/sunrpc/auth_gss/svcauth_gss.c +6
-0@@ -824,12 +824,18 @@ svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name) new->h.flavour = &svcauthops_gss; new->pseudoflavor = pseudoflavor; +if (!try_module_get (svcauthops_gss.owner)) { + stat = -ENODEV ; + goto out_free_name; + } + test =auth_domain_lookup (name, &new->h);if (test != &new->h) {pr_warn ("svc: duplicate registration of gss pseudo flavour %s.\n" , name); stat = -EADDRINUSE ;auth_domain_put (test); +module_put (svcauthops_gss.owner); goto out_free_name; }return test;@@ -2004,9 +2010,11 @@ svcauth_gss_domain_release_rcu(struct rcu_head *head) {
net/sunrpc/auth_gss/svcauth_gss.c svcauth_gss_domain_release_rcu(struct rcu_head *head) · line 2020
Quoted 10 lines
net/sunrpc/auth_gss/svcauth_gss.c +2
-0struct auth_domain *dom = container_of(head, struct auth_domain, rcu_head); struct gss_domain *gd = container_of(dom, struct gss_domain, h); +struct module *owner = dom->flavour->owner;kfree (dom->name);kfree (gd); +module_put (owner); } static void