Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b922934d authored by Julian Anastasov's avatar Julian Anastasov Committed by David S. Miller
Browse files

netns: do not leak net_generic data on failed init 



ops_init should free the net_generic data on
init failure and __register_pernet_operations should not
call ops_free when NET_NS is not enabled.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Reviewed-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9fe5642f

net/core/net_namespace.c

+18 −15
Original line number Diff line number Diff line
@@ -83,21 +83,29 @@ static int net_assign_generic(struct net *net, int id, void *data) 


static int ops_init(const struct pernet_operations *ops, struct net *net)

{

	int err;

	int err = -ENOMEM;

	void *data = NULL;



	if (ops->id && ops->size) {

		void *data = kzalloc(ops->size, GFP_KERNEL);

		data = kzalloc(ops->size, GFP_KERNEL);

		if (!data)

			return -ENOMEM;

			goto out;



		err = net_assign_generic(net, *ops->id, data);

		if (err) {

			kfree(data);

			return err;

		}

		if (err)

			goto cleanup;

	}

	err = 0;

	if (ops->init)

		return ops->init(net);

		err = ops->init(net);

	if (!err)

		return 0;



cleanup:

	kfree(data);



out:

	return err;

}



static void ops_free(const struct pernet_operations *ops, struct net *net)
@@ -448,12 +456,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops) 
static int __register_pernet_operations(struct list_head *list,

					struct pernet_operations *ops)

{

	int err = 0;

	err = ops_init(ops, &init_net);

	if (err)

		ops_free(ops, &init_net);

	return err;

	

	return ops_init(ops, &init_net);

}



static void __unregister_pernet_operations(struct pernet_operations *ops)