rds: synchronize info callbacks with module unload
Subsystems (4)
PATCH v4 1/1 rds: synchronize info callbacks with module unload
rds_info_getsockopt() reads a callback from rds_info_funcs and invokes it without protecting the callback's lifetime. Transport modules register functions stored in this array. For example, rds_tcp.ko registers rds_tcp_tc_info() for RDS_INFO_TCP_SOCKETS.
This permits the following interleaving:
CPU0 CPU1
rds_info_getsockopt()
func = rds_tcp_tc_info
rmmod rds_tcp
rds_tcp_exit()
rds_info_deregister_func()
rds_info_funcs[offset] = NULL
free rds_tcp module text
func()
The reader can therefore branch to an address in unloaded module text.
Protect callback invocation with SRCU. Enter the SRCU read-side critical section before loading the callback and leave it only after the callback returns. Clear the callback with WRITE_ONCE() and call synchronize_srcu() before deregistration returns, preventing module unload from freeing its text while an old reader is still executing it. SRCU is required because callbacks such as RDS_INFO_COUNTERS can sleep.
Keep the callback array unannotated and use READ_ONCE() and WRITE_ONCE() for concurrent slot access so sparse does not have to apply __rcu through the function-pointer typedef. Replace the two callback-slot BUG_ON() checks with WARN_ON_ONCE() and return without changing the slot on mismatch.
---
Changes in v4:
- Use READ_ONCE() and WRITE_ONCE() because the callback pointer does not publish associated state requiring acquire/release ordering.
- Keep the local variable declarations in reverse-Xmas-tree order.
Changes in v3:
- Use ordinary loads for callback-slot validation under rds_info_lock; retain acquire semantics only for the lockless reader.
- Drop the Fixes tag because this patch targets net-next.
- Add Allison Henderson's Reviewed-by tag.
Changes in v2:
- Split the info callback/module-unload race from the independent inc->i_conn lifetime bug.
- Keep the callback array unannotated and use smp_load_acquire() and smp_store_release() to resolve the sparse errors.
- Replace the two touched callback-slot BUG_ON() checks with WARN_ON_ONCE() error paths.
- Rewrite the commit message for the callback race and omit the unrelated inc->i_conn KASAN report.
net/rds/info.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
net/rds/info.c +18 -5
@@ -32,6 +32,7 @@*/ #include <linux/percpu.h> #include <linux/seq_file.h> +#include <linux/srcu.h> #include <linux/slab.h> #include <linux/proc_fs.h> #include <linux/export.h>
@@ -68,6 +69,7 @@ struct rds_info_iterator {unsigned long offset; }; +DEFINE_STATIC_SRCU (rds_info_srcu);static DEFINE_SPINLOCK (rds_info_lock);static rds_info_func rds_info_funcs[RDS_INFO_LAST -RDS_INFO_FIRST +1 ];
@@ -78,8 +80,11 @@ void rds_info_register_func(int optname, rds_info_func func)BUG_ON (optname <RDS_INFO_FIRST || optname >RDS_INFO_LAST );spin_lock (&rds_info_lock); -BUG_ON (rds_info_funcs[offset]); - rds_info_funcs[offset] = func; +if (WARN_ON_ONCE (rds_info_funcs[offset])) { +spin_unlock (&rds_info_lock); +return ; + } +WRITE_ONCE (rds_info_funcs[offset], func);spin_unlock (&rds_info_lock); }EXPORT_SYMBOL_GPL (rds_info_register_func);
@@ -91,9 +96,13 @@ void rds_info_deregister_func(int optname, rds_info_func func)BUG_ON (optname <RDS_INFO_FIRST || optname >RDS_INFO_LAST );spin_lock (&rds_info_lock); -BUG_ON (rds_info_funcs[offset] != func); - rds_info_funcs[offset] =NULL ; +if (WARN_ON_ONCE (rds_info_funcs[offset] != func)) { +spin_unlock (&rds_info_lock); +return ; + } +WRITE_ONCE (rds_info_funcs[offset],NULL );spin_unlock (&rds_info_lock); +synchronize_srcu (&rds_info_srcu); }EXPORT_SYMBOL_GPL (rds_info_deregister_func);
@@ -162,6 +171,7 @@ int rds_info_getsockopt(struct socket *sock, int optname, sockopt_t *opt) +int srcu_idx;int npages =0 ;int ret;int len;int total; len = opt->optlen;
@@ -214,8 +224,10 @@ int rds_info_getsockopt(struct socket *sock, int optname, sockopt_t *opt)rdsdebug ("len %d nr_pages %lu\n" , len, nr_pages); call_func: - func = rds_info_funcs[optname -RDS_INFO_FIRST ]; + srcu_idx =srcu_read_lock (&rds_info_srcu); + func =READ_ONCE (rds_info_funcs[optname -RDS_INFO_FIRST ]);if (!func) { +srcu_read_unlock (&rds_info_srcu, srcu_idx); ret = -ENOPROTOOPT ; goto out; }
@@ -225,6 +237,7 @@ int rds_info_getsockopt(struct socket *sock, int optname, sockopt_t *opt) iter.offset = offset0;func (sock, len, &iter, &lens); +srcu_read_unlock (&rds_info_srcu, srcu_idx);BUG_ON (lens.each ==0 ); total = lens.nr * lens.each;
Signature · 1 line
2.43.0
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Sat, 1 Aug 2026 13:42:34 +0800 you wrote:
rds_info_getsockopt()reads a callback fromrds_info_funcsand invokes it without protecting the callback's lifetime. Transport modules register functions stored in this array. For example, rds_tcp.ko registersrds_tcp_tc_info()forRDS_INFO_TCP_SOCKETS.This permits the following interleaving:
[...]
Here is the summary with links:
- [net-next,v4] rds: synchronize info callbacks with module unload
https://git.kernel.org/netdev/net-next/c/2bb824660ef8
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html