diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 6c9c6ac83936..c01245a19ea2 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -6438,9 +6438,6 @@ void cgroup_sk_alloc_disable(void) void cgroup_sk_alloc(struct sock_cgroup_data *skcd) { - if (cgroup_sk_alloc_disabled) - return; - /* Socket clone path */ if (skcd->val) { /* @@ -6453,6 +6450,9 @@ void cgroup_sk_alloc(struct sock_cgroup_data *skcd) return; } + if (cgroup_sk_alloc_disabled) + return; + /* Don't associate the sock with unrelated interrupted task's cgroup. */ if (in_interrupt()) return;