From patchwork Fri Oct 18 16:52:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 11199223 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 96BF317EE for ; Fri, 18 Oct 2019 16:52:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 58F4320869 for ; Fri, 18 Oct 2019 16:52:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="G7/uFZnt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 58F4320869 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 95D9B8E0006; Fri, 18 Oct 2019 12:52:46 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 90DF68E0003; Fri, 18 Oct 2019 12:52:46 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FD618E0006; Fri, 18 Oct 2019 12:52:46 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0250.hostedemail.com [216.40.44.250]) by kanga.kvack.org (Postfix) with ESMTP id 612238E0003 for ; Fri, 18 Oct 2019 12:52:46 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 09F186137 for ; Fri, 18 Oct 2019 16:52:46 +0000 (UTC) X-FDA: 76057499532.16.grape65_524b953fa820c X-Spam-Summary: 2,0,0,f3d1160c7b4b0b91,d41d8cd98f00b204,33o2pxqgkcfmd2v5zz6w19916z.x97638fi-775gvx5.9c1@flex--shakeelb.bounces.google.com,:guro@fb.com::cgroups@vger.kernel.org:linux-kernel@vger.kernel.org:shakeelb@google.com:syzbot+515d5bcfe179cdf049b2@syzkaller.appspotmail.com:mhocko@suse.com:hannes@cmpxchg.org:vdavydov.dev@gmail.com:stable@vger.kernel.org:akpm@linux-foundation.org,RULES_HIT:41:152:355:379:541:800:960:966:973:988:989:1260:1277:1313:1314:1345:1431:1437:1516:1518:1535:1544:1593:1594:1605:1711:1730:1747:1777:1792:2196:2199:2393:2559:2562:2897:2899:2901:3138:3139:3140:3141:3142:3152:3865:3866:3867:3868:3870:3871:4118:4321:4385:5007:6119:6120:6238:6261:6653:7514:7809:7903:8660:9163:9969:10004:11026:11473:11658:11914:12043:12296:12297:12438:12555:12679:12740:12895:12986:13148:13221:13229:13230:13870:14093:14096:14097:14181:14394:14659:14721:21080:21444:21451:21622:21795:30012:30029:30051:30054:30056:30064,0,RBL:209.85.215.201:@flex--shakeelb.bounces.google.com:.lb l8.mails X-HE-Tag: grape65_524b953fa820c X-Filterd-Recvd-Size: 7543 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) by imf44.hostedemail.com (Postfix) with ESMTP for ; Fri, 18 Oct 2019 16:52:45 +0000 (UTC) Received: by mail-pg1-f201.google.com with SMTP id f10so4669019pgj.0 for ; Fri, 18 Oct 2019 09:52:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=yWD+8FP6D8DfujJ7rsI4O3txgqrFc1FsN7SOOiTmyZA=; b=G7/uFZntGWL1Sd6i0OmT6HrejeSuZX5Fn71TrVkVfcXP2GghJpud+Fh0KwkgY9qgTd d0mKZKqQojWelgXU2KA2wVtTPxOFvjtmWOYCDj8DW/lbI8CvU1Nd57uYJCACqLCOCJTY 28SD7bydR3Y8tPRCxNbR6pwed6lJE3zHpbF3670cjQGksrEgy/eFbvEzR+xnHQ9K4lX3 49Do0H5e7dcv8dthphBvsndxB7kIuILeUX3ksKUf/RkjTpHi7cIUlf0B7pc89HvhYcK+ bzcMgLZyJLWlWpjXtVpv78Zl3je0NfajuhkgdDPfzqWUQBd1jaYiFeOiDi7IabP60P/H 43sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=yWD+8FP6D8DfujJ7rsI4O3txgqrFc1FsN7SOOiTmyZA=; b=i4IaxCwSun+03c8wLvY7ZCBvH/RqXxAEmWEKl33CJp0f5+2XiZ67j0rqgEfnCAv1au byKGbokR6K5LKVQ5Yt89cxJqQ+UI5RUCR3Xpq5NmH+5lRb0AnkaTdX5YT+SB0j5flDe/ Dj/Z32BkJAxL4fYQW8zG5zsUQKzjSjZeIzjSVnEAl7LedE2XD1nLJ2K7PFcgBFknagGM fe5z2S9ipLpMPtjmTE9AlF/IzapmjHSCK0NyVLMSxQFXTgWZCdw0XPecZNnuSnq7x0GR dh1n2py5kfS8ph/xBJUOwIt51M4hfzXE5sU9UqNES9yzJcGpCp5MXN7Auhqlr2f+AbAb et9w== X-Gm-Message-State: APjAAAXw43GzeDtln+wKdVxocAMhg6nOng82Zhv535/hg4R3PZ/biTt0 8KBh5Y9+sQq57oJ5RnP+5xpUjIAVYcEbVQ== X-Google-Smtp-Source: APXvYqw0AZIql94+DUFhLMqbDzyVhCnNkmLnU+LuFyUVmZOlZOlX79dC8N+AjV/sSoiuHomiIBHw5PgsWreDGA== X-Received: by 2002:a65:6408:: with SMTP id a8mr11107468pgv.357.1571417564005; Fri, 18 Oct 2019 09:52:44 -0700 (PDT) Date: Fri, 18 Oct 2019 09:52:31 -0700 Message-Id: <20191018165231.249872-1-shakeelb@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.23.0.866.gb869b98d4c-goog Subject: [PATCH] mm: memcontrol: fix NULL-ptr deref in percpu stats flush From: Shakeel Butt To: Roman Gushchin Cc: linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Shakeel Butt , syzbot+515d5bcfe179cdf049b2@syzkaller.appspotmail.com, Michal Hocko , Johannes Weiner , Vladimir Davydov , stable@vger.kernel.org, Andrew Morton X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: __mem_cgroup_free() can be called on the failure path in mem_cgroup_alloc(). However memcg_flush_percpu_vmstats() and memcg_flush_percpu_vmevents() which are called from __mem_cgroup_free() access the fields of memcg which can potentially be null if called from failure path from mem_cgroup_alloc(). Indeed syzbot has reported the following crash: R13: 00000000004bf27d R14: 00000000004db028 R15: 0000000000000003 kasan: CONFIG_KASAN_INLINE enabled kasan: GPF could be caused by NULL-ptr deref or user memory access general protection fault: 0000 [#1] PREEMPT SMP KASAN CPU: 0 PID: 30393 Comm: syz-executor.1 Not tainted 5.4.0-rc2+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:memcg_flush_percpu_vmstats+0x4ae/0x930 mm/memcontrol.c:3436 Code: 05 41 89 c0 41 0f b6 04 24 41 38 c7 7c 08 84 c0 0f 85 5d 03 00 00 44 3b 05 33 d5 12 08 0f 83 e2 00 00 00 4c 89 f0 48 c1 e8 03 <42> 80 3c 28 00 0f 85 91 03 00 00 48 8b 85 10 fe ff ff 48 8b b0 90 RSP: 0018:ffff888095c27980 EFLAGS: 00010206 RAX: 0000000000000012 RBX: ffff888095c27b28 RCX: ffffc90008192000 RDX: 0000000000040000 RSI: ffffffff8340fae7 RDI: 0000000000000007 RBP: ffff888095c27be0 R08: 0000000000000000 R09: ffffed1013f0da33 R10: ffffed1013f0da32 R11: ffff88809f86d197 R12: fffffbfff138b760 R13: dffffc0000000000 R14: 0000000000000090 R15: 0000000000000007 FS: 00007f5027170700(0000) GS:ffff8880ae800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000710158 CR3: 00000000a7b18000 CR4: 00000000001406f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: __mem_cgroup_free+0x1a/0x190 mm/memcontrol.c:5021 mem_cgroup_free mm/memcontrol.c:5033 [inline] mem_cgroup_css_alloc+0x3a1/0x1ae0 mm/memcontrol.c:5160 css_create kernel/cgroup/cgroup.c:5156 [inline] cgroup_apply_control_enable+0x44d/0xc40 kernel/cgroup/cgroup.c:3119 cgroup_mkdir+0x899/0x11b0 kernel/cgroup/cgroup.c:5401 kernfs_iop_mkdir+0x14d/0x1d0 fs/kernfs/dir.c:1124 vfs_mkdir+0x42e/0x670 fs/namei.c:3807 do_mkdirat+0x234/0x2a0 fs/namei.c:3830 __do_sys_mkdir fs/namei.c:3846 [inline] __se_sys_mkdir fs/namei.c:3844 [inline] __x64_sys_mkdir+0x5c/0x80 fs/namei.c:3844 do_syscall_64+0xfa/0x760 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x459a59 Code: fd b7 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 cb b7 fb ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007f502716fc78 EFLAGS: 00000246 ORIG_RAX: 0000000000000053 RAX: ffffffffffffffda RBX: 00007f502716fc90 RCX: 0000000000459a59 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000020000180 RBP: 000000000075bf20 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f50271706d4 R13: 00000000004bf27d R14: 00000000004db028 R15: 0000000000000003 Fixing this by moving the flush to mem_cgroup_free as there is no need to flush anything if we see failure in mem_cgroup_alloc(). Reported-by: syzbot+515d5bcfe179cdf049b2@syzkaller.appspotmail.com Fixes: bb65f89b7d3d ("mm: memcontrol: flush percpu vmevents before releasing memcg") Fixes: c350a99ea2b1 ("mm: memcontrol: flush percpu vmstats before releasing memcg") Signed-off-by: Shakeel Butt Cc: Roman Gushchin Cc: Michal Hocko Cc: Johannes Weiner Cc: Vladimir Davydov Cc: Cc: Andrew Morton Reviewed-by: Roman Gushchin --- mm/memcontrol.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index bdac56009a38..13cb4c1e9f2a 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5014,12 +5014,6 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg) { int node; - /* - * Flush percpu vmstats and vmevents to guarantee the value correctness - * on parent's and all ancestor levels. - */ - memcg_flush_percpu_vmstats(memcg, false); - memcg_flush_percpu_vmevents(memcg); for_each_node(node) free_mem_cgroup_per_node_info(memcg, node); free_percpu(memcg->vmstats_percpu); @@ -5030,6 +5024,12 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg) static void mem_cgroup_free(struct mem_cgroup *memcg) { memcg_wb_domain_exit(memcg); + /* + * Flush percpu vmstats and vmevents to guarantee the value correctness + * on parent's and all ancestor levels. + */ + memcg_flush_percpu_vmstats(memcg, false); + memcg_flush_percpu_vmevents(memcg); __mem_cgroup_free(memcg); }