Commit 849d5aa3 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

af_unix: Do not call kmemdup() for init_net's sysctl table. 



While setting up init_net's sysctl table, we need not duplicate the
global table and can use it directly as ipv4_sysctl_init_net() does.

Unlike IPv4, AF_UNIX does not have a huge sysctl table for now, so it
cannot be a problem, but this patch makes code consistent.

Acked-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20220627233627.51646-1-kuniyu@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d521bc0a

net/unix/sysctl_net_unix.c

+13 −6
Original line number Diff line number Diff line
@@ -26,11 +26,16 @@ int __net_init unix_sysctl_register(struct net *net) 
{

	struct ctl_table *table;



	if (net_eq(net, &init_net)) {

		table = unix_table;

	} else {

		table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);

	if (table == NULL)

		if (!table)

			goto err_alloc;



		table[0].data = &net->unx.sysctl_max_dgram_qlen;

	}



	net->unx.ctl = register_net_sysctl(net, "net/unix", table);

	if (net->unx.ctl == NULL)

		goto err_reg;
@@ -38,6 +43,7 @@ int __net_init unix_sysctl_register(struct net *net) 
	return 0;



err_reg:

	if (net_eq(net, &init_net))

		kfree(table);

err_alloc:

	return -ENOMEM;
@@ -49,5 +55,6 @@ void unix_sysctl_unregister(struct net *net) 


	table = net->unx.ctl->ctl_table_arg;

	unregister_net_sysctl_table(net->unx.ctl);

	if (!net_eq(net, &init_net))

		kfree(table);

}