Merge branch 'for-4.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[mirror_ubuntu-bionic-kernel.git] / kernel / cgroup.c

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 0d4ee1ea5c3165866e327d8125b54758ba7bcaa0..d6b729beba4930bbb1a1ddc4a6a6b8533bbf94e0 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -6291,6 +6291,12 @@ void cgroup_sk_alloc(struct sock_cgroup_data *skcd)
        if (cgroup_sk_alloc_disabled)
                return;
 
+       /* Socket clone path */
+       if (skcd->val) {
+               cgroup_get(sock_cgroup_ptr(skcd));
+               return;
+       }
+
        rcu_read_lock();
 
        while (true) {