From: Yang Yingliang <yangyingliang@huawei.com>
Date: Thu, 13 Aug 2020 20:27:57 +0000 (+0000)
Subject: cgroup: add missing skcd->no_refcnt check in cgroup_sk_clone()
X-Git-Tag: v4.9.233~130
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3b1d647251a94a6968a35e3d685dc8b1b24c3ff;p=platform%2Fkernel%2Flinux-amlogic.git

cgroup: add missing skcd->no_refcnt check in cgroup_sk_clone()

Add skcd->no_refcnt check which is missed when backporting
ad0f75e5f57c ("cgroup: fix cgroup_sk_alloc() for sk_clone_lock()").

This patch is needed in stable-4.9, stable-4.14 and stable-4.19.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index f047c73189f3..684d02f343b4 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -6355,6 +6355,8 @@ void cgroup_sk_clone(struct sock_cgroup_data *skcd)
 {
 	/* Socket clone path */
 	if (skcd->val) {
+		if (skcd->no_refcnt)
+			return;
 		/*
 		 * We might be cloning a socket which is left in an empty
 		 * cgroup and the cgroup might have already been rmdir'd.