Skip to content

Commit 9fc17b7

Browse files
matttbekuba-moo
authored andcommitted
sctp: sysctl: rto_min/max: 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, 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.rto_min/max' is used. Fixes: 4f3fdf3 ("sctp: add check rto_min and rto_max in sysctl") Cc: [email protected] Link: https://lore.kernel.org/[email protected] [1] Suggested-by: Al Viro <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent ea62dd1 commit 9fc17b7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/sctp/sysctl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ static int proc_sctp_do_hmac_alg(const struct ctl_table *ctl, int write,
433433
static int proc_sctp_do_rto_min(const struct ctl_table *ctl, int write,
434434
void *buffer, size_t *lenp, loff_t *ppos)
435435
{
436-
struct net *net = current->nsproxy->net_ns;
436+
struct net *net = container_of(ctl->data, struct net, sctp.rto_min);
437437
unsigned int min = *(unsigned int *) ctl->extra1;
438438
unsigned int max = *(unsigned int *) ctl->extra2;
439439
struct ctl_table tbl;
@@ -461,7 +461,7 @@ static int proc_sctp_do_rto_min(const struct ctl_table *ctl, int write,
461461
static int proc_sctp_do_rto_max(const struct ctl_table *ctl, int write,
462462
void *buffer, size_t *lenp, loff_t *ppos)
463463
{
464-
struct net *net = current->nsproxy->net_ns;
464+
struct net *net = container_of(ctl->data, struct net, sctp.rto_max);
465465
unsigned int min = *(unsigned int *) ctl->extra1;
466466
unsigned int max = *(unsigned int *) ctl->extra2;
467467
struct ctl_table tbl;

0 commit comments

Comments
 (0)