diff options
| author |   Eric Dumazet <edumazet@google.com> | 2017-10-10 19:12:32 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-10-10 20:24:29 -0700 |
| commit | 75cb070960ade40fba5de32138390f3c85c90941 (patch) | |
| tree | 0a2ff2fbc1f4ba7381f5ea88b716d732c66e6f63 /kernel | |
| parent | Merge branch 'nfp-fix-ethtool-stats-and-page-allocation' (diff) | |
| download | linux-dev-75cb070960ade40fba5de32138390f3c85c90941.tar.xz linux-dev-75cb070960ade40fba5de32138390f3c85c90941.zip | |
Revert "net: defer call to cgroup_sk_alloc()"
This reverts commit fbb1fb4ad415cb31ce944f65a5ca700aaf73a227.
This was not the proper fix, lets cleanly revert it, so that
following patch can be carried to stable versions.
sock_cgroup_ptr() callers do not expect a NULL return value.
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cgroup/cgroup.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 3380a3e49af5..44857278eb8a 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -5709,6 +5709,17 @@ void cgroup_sk_alloc(struct sock_cgroup_data *skcd) if (cgroup_sk_alloc_disabled) return; + /* Socket clone path */ + if (skcd->val) { + /* + * We might be cloning a socket which is left in an empty + * cgroup and the cgroup might have already been rmdir'd. + * Don't use cgroup_get_live(). + */ + cgroup_get(sock_cgroup_ptr(skcd)); + return; + } + rcu_read_lock(); while (true) { |