From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,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 C507DC33CB6 for ; Thu, 16 Jan 2020 16:58:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8DEE721582 for ; Thu, 16 Jan 2020 16:58:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193896; bh=2ORim8Gw6y+bmu+5x5k72nRgq8wbF79nDQI30E8GLT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g/3e4C3t45S0Fhp0zdLK72jWYBCZIhZNU3HakU0MEslfadrs98r258CSgXXp8Ft6K albJKY2/KRjt9Ff9Zk4cdHygwT7uvlKjcsPgMFrwk6uiDX52iWfAHpdnph/txMNWpK NKmV+Dcg2GK9g8ZC27rSK8M5VSanKr5S2iMqXyf0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733084AbgAPQ5v (ORCPT ); Thu, 16 Jan 2020 11:57:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:45028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729521AbgAPQ5j (ORCPT ); Thu, 16 Jan 2020 11:57:39 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 58F9824656; Thu, 16 Jan 2020 16:57:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193858; bh=2ORim8Gw6y+bmu+5x5k72nRgq8wbF79nDQI30E8GLT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uPS+JBy+Jv8U5PBu929m44qExknZs5B/l5iXVWng3Dhu5O2yn/MX67rOCStdo9mcs ghi8AjtZDp01GB4HLNFImOuRFUz1gQUj4j6DtFRdbqUC8ZmhXRmvPSnonQ/LQDHITP DlnIb/V3O2i+6ecfcwVwooBfjYZRfQNK8TJRzt3s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shakeel Butt , Michal Hocko , Rik van Riel , Roman Gushchin , Johannes Weiner , Tejun Heo , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 4.19 107/671] fork, memcg: fix cached_stacks case Date: Thu, 16 Jan 2020 11:45:38 -0500 Message-Id: <20200116165502.8838-107-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116165502.8838-1-sashal@kernel.org> References: <20200116165502.8838-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shakeel Butt [ Upstream commit ba4a45746c362b665e245c50b870615f02f34781 ] Commit 5eed6f1dff87 ("fork,memcg: fix crash in free_thread_stack on memcg charge fail") fixes a crash caused due to failed memcg charge of the kernel stack. However the fix misses the cached_stacks case which this patch fixes. So, the same crash can happen if the memcg charge of a cached stack is failed. Link: http://lkml.kernel.org/r/20190102180145.57406-1-shakeelb@google.com Fixes: 5eed6f1dff87 ("fork,memcg: fix crash in free_thread_stack on memcg charge fail") Signed-off-by: Shakeel Butt Acked-by: Michal Hocko Acked-by: Rik van Riel Cc: Rik van Riel Cc: Roman Gushchin Cc: Johannes Weiner Cc: Tejun Heo Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- kernel/fork.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/fork.c b/kernel/fork.c index 5718c5decc55..1bd119530a49 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -216,6 +216,7 @@ static unsigned long *alloc_thread_stack_node(struct task_struct *tsk, int node) memset(s->addr, 0, THREAD_SIZE); tsk->stack_vm_area = s; + tsk->stack = s->addr; return s->addr; } -- 2.20.1