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

Commit c0576e39 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: call cgroup_sk_alloc() earlier in sk_clone_lock() 



If for some reason, the newly allocated child need to be freed,
we will call cgroup_put() (via sk_free_unlock_clone()) while the
corresponding cgroup_get() was not yet done, and we will free memory
too soon.

Fixes: d979a39d ("cgroup: duplicate cgroup reference when cloning sockets")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75cb0709

net/core/sock.c

+1 −2
Original line number Diff line number Diff line
@@ -1687,6 +1687,7 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) 
		atomic_set(&newsk->sk_zckey, 0);



		sock_reset_flag(newsk, SOCK_DONE);

		cgroup_sk_alloc(&newsk->sk_cgrp_data);



		rcu_read_lock();

		filter = rcu_dereference(sk->sk_filter);
@@ -1718,8 +1719,6 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) 
		newsk->sk_incoming_cpu = raw_smp_processor_id();

		atomic64_set(&newsk->sk_cookie, 0);



		cgroup_sk_alloc(&newsk->sk_cgrp_data);



		/*

		 * Before updating sk_refcnt, we must commit prior changes to memory

		 * (Documentation/RCU/rculist_nulls.txt for details)