aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJohannes Weiner <jweiner@fb.com>2016-09-19 17:44:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-09-19 18:36:17 -0400
commitd979a39d7242e0601bf9b60e89628fb8ac577179 (patch)
treef790aa92992c9bf54088de8d8bf0fa275252ab1f /kernel
parentdb2ba40c277dc545bab531671c3f45ac0afea6f8 (diff)
cgroup: duplicate cgroup reference when cloning sockets
When a socket is cloned, the associated sock_cgroup_data is duplicated but not its reference on the cgroup. As a result, the cgroup reference count will underflow when both sockets are destroyed later on. Fixes: bd1060a1d671 ("sock, cgroup: add sock->sk_cgroup") Link: http://lkml.kernel.org/r/20160914194846.11153-2-hannes@cmpxchg.org Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Tejun Heo <tj@kernel.org> Cc: Michal Hocko <mhocko@suse.cz> Cc: Vladimir Davydov <vdavydov@virtuozzo.com> Cc: <stable@vger.kernel.org> [4.5+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index d1c51b7f5221..5e8dab5bf9ad 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -6270,6 +6270,12 @@ void cgroup_sk_alloc(struct sock_cgroup_data *skcd)
6270 if (cgroup_sk_alloc_disabled) 6270 if (cgroup_sk_alloc_disabled)
6271 return; 6271 return;
6272 6272
6273 /* Socket clone path */
6274 if (skcd->val) {
6275 cgroup_get(sock_cgroup_ptr(skcd));
6276 return;
6277 }
6278
6273 rcu_read_lock(); 6279 rcu_read_lock();
6274 6280
6275 while (true) { 6281 while (true) {