Message ID | 20200317103302.430176101@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=f8y2=5C=vger.kernel.org=stable-owner@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 109DCC2BB1D for <stable@archiver.kernel.org>; Tue, 17 Mar 2020 10:56:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3A8820736 for <stable@archiver.kernel.org>; Tue, 17 Mar 2020 10:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584442613; bh=8xlKHdXcq50TQeiNRTSWq5J8dLMcb8V8kxTFARwmYh0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SL+ge2br9Gg0X2zw8Tbq9PQ187iYjnSIfty44+ulQHGX4JUaNVKKPtk2fLARt0znh 3RFTG7iBzRNG7DcF5MpZj3qRWjQuoLA9AcEmeae1nlS4Cyz7X91WiBCqfHNNfR/+1c 5IM3haGGOxo7mbjktk7s8m9OHYUnghwrg9tjfuA8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726777AbgCQK4u (ORCPT <rfc822;stable@archiver.kernel.org>); Tue, 17 Mar 2020 06:56:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:34508 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726774AbgCQK4t (ORCPT <rfc822;stable@vger.kernel.org>); Tue, 17 Mar 2020 06:56:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8531120658; Tue, 17 Mar 2020 10:56:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584442609; bh=8xlKHdXcq50TQeiNRTSWq5J8dLMcb8V8kxTFARwmYh0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=olPG9Jj2NkxPmKOnjPJIHVczvKWvXrzKFkEFOkvHSI2vVJI3eFW3XoOt7kQ+qOmMN IK55AJuXWE5m1+eN+rhd91TF42Ot2Cnjrb8TGUo1a5IPhpzmdNah7P44XZVGSIogKh grxkfwTWrU88nYdY23zuWtj5VwRZYN8BpEXND/Bg= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Shakeel Butt <shakeelb@google.com>, Roman Gushchin <guro@fb.com>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 4.19 21/89] cgroup: memcg: net: do not associate sock with unrelated cgroup Date: Tue, 17 Mar 2020 11:54:30 +0100 Message-Id: <20200317103302.430176101@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317103259.744774526@linuxfoundation.org> References: <20200317103259.744774526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -5929,6 +5929,10 @@ void cgroup_sk_alloc(struct sock_cgroup_ return; } + /* Don't associate the sock with unrelated interrupted task's cgroup. */ + if (in_interrupt()) + return; + rcu_read_lock(); while (true) { --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6321,6 +6321,10 @@ void mem_cgroup_sk_alloc(struct sock *sk return; } + /* Do not associate the sock with unrelated interrupted task's memcg. */ + if (in_interrupt()) + return; + rcu_read_lock(); memcg = mem_cgroup_from_task(current); if (memcg == root_mem_cgroup)