diff options
| author | Matthieu Baerts (NGI0) <matttbe@kernel.org> | 2025-01-08 16:34:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-01-23 17:15:51 +0100 |
| commit | 1dc5da6c4178f3e4b95c631418f72de9f86c0449 (patch) | |
| tree | 3952e6c8a159abdd7afb4a73e6b27b9321c14343 /net | |
| parent | 0a0966312ac3eedd7f5f2a766ed4702df39a9a65 (diff) | |
| download | linux-1dc5da6c4178f3e4b95c631418f72de9f86c0449.tar.gz linux-1dc5da6c4178f3e4b95c631418f72de9f86c0449.tar.bz2 linux-1dc5da6c4178f3e4b95c631418f72de9f86c0449.zip | |
sctp: sysctl: plpmtud_probe_interval: avoid using current->nsproxy
commit 6259d2484d0ceff42245d1f09cc8cb6ee72d847a upstream.
As mentioned in a previous commit of this series, using the 'net'
structure via 'current' is not recommended for different reasons:
- Inconsistency: getting info from the reader's/writer's netns vs only
from the opener's netns.
- current->nsproxy can be NULL in some cases, resulting in an 'Oops'
(null-ptr-deref), e.g. when the current task is exiting, as spotted by
syzbot [1] using acct(2).
The 'net' structure can be obtained from the table->data using
container_of().
Note that table->data could also be used directly, as this is the only
member needed from the 'net' structure, but that would increase the size
of this fix, to use '*data' everywhere 'net->sctp.probe_interval' is
used.
Fixes: d1e462a7a5f3 ("sctp: add probe_interval in sysctl and sock/asoc/transport")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/67769ecb.050a0220.3a8527.003f.GAE@google.com [1]
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250108-net-sysctl-current-nsproxy-v1-8-5df34b2083e8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sctp/sysctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c index ebe81539d30a..916dc2e81e42 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c @@ -562,7 +562,8 @@ static int proc_sctp_do_udp_port(struct ctl_table *ctl, int write, static int proc_sctp_do_probe_interval(struct ctl_table *ctl, int write, void *buffer, size_t *lenp, loff_t *ppos) { - struct net *net = current->nsproxy->net_ns; + struct net *net = container_of(ctl->data, struct net, + sctp.probe_interval); struct ctl_table tbl; int ret, new_value; |
