net: call cgroup_sk_alloc() earlier in sk_clone_lock() (c0576e39) · Commits · 戴 / test

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: ("cgroup: duplicate cgroup reference when cloning sockets") Signed-off-by:

Eric Dumazet <edumazet@google.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Tejun Heo <tj@kernel.org> Signed-off-by:

David S. Miller <davem@davemloft.net>

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)

Admin message