Merge branch 'locking/urgent' into locking/core, to pick up fixes

[karo-tx-linux.git] / kernel / cgroup.c

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 9f51cdf58f5a127002e4fa6d10ac677fc9141675..de1c1bddb4d1f8ad98ff071b3f001e6839e8ed2f 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -6276,6 +6276,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) {