Skip to content

Commit 1758d7e

Browse files
author
Xin Long
committed
sctp: sysctl: udp_port: avoid using current->nsproxy
JIRA: https://issues.redhat.com/browse/RHEL-84590 Tested: compile only commit c10377b Author: Matthieu Baerts (NGI0) <matttbe@kernel.org> Date: Wed Jan 8 16:34:35 2025 +0100 sctp: sysctl: udp_port: avoid using current->nsproxy 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, but that would increase the size of this fix, while 'sctp.ctl_sock' still needs to be retrieved from 'net' structure. Fixes: 046c052 ("sctp: enable udp tunneling socks") 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-7-5df34b2083e8@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Xin Long <lxin@redhat.com>
1 parent 8ecd60e commit 1758d7e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/sctp/sysctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
532532
static int proc_sctp_do_udp_port(struct ctl_table *ctl, int write,
533533
void *buffer, size_t *lenp, loff_t *ppos)
534534
{
535-
struct net *net = current->nsproxy->net_ns;
535+
struct net *net = container_of(ctl->data, struct net, sctp.udp_port);
536536
unsigned int min = *(unsigned int *)ctl->extra1;
537537
unsigned int max = *(unsigned int *)ctl->extra2;
538538
struct ctl_table tbl;

0 commit comments

Comments
 (0)