Skip to content

Commit ea62dd1

Browse files
matttbekuba-moo
authored andcommitted
sctp: sysctl: cookie_hmac_alg: 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.sctp_hmac_alg' is used. Fixes: 3c68198 ("sctp: Make hmac algorithm selection for cookie generation dynamic") 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 92cf7a5 commit ea62dd1

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

net/sctp/sysctl.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,8 @@ static struct ctl_table sctp_net_table[] = {
387387
static int proc_sctp_do_hmac_alg(const struct ctl_table *ctl, int write,
388388
void *buffer, size_t *lenp, loff_t *ppos)
389389
{
390-
struct net *net = current->nsproxy->net_ns;
390+
struct net *net = container_of(ctl->data, struct net,
391+
sctp.sctp_hmac_alg);
391392
struct ctl_table tbl;
392393
bool changed = false;
393394
char *none = "none";

0 commit comments

Comments
 (0)