From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752948AbcFVRAH (ORCPT ); Wed, 22 Jun 2016 13:00:07 -0400 Received: from mail-db3on0108.outbound.protection.outlook.com ([157.55.234.108]:14123 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752886AbcFVRAB (ORCPT ); Wed, 22 Jun 2016 13:00:01 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=VDavydov@virtuozzo.com; Date: Wed, 22 Jun 2016 19:44:12 +0300 From: Vladimir Davydov To: Tejun Heo CC: Andrew Morton , Johannes Weiner , Michal Hocko , , , Subject: Re: [PATCH] memcg: css_alloc should return an ERR_PTR value on error Message-ID: <20160622164412.GD21652@esperanza> References: <20160621165740.GJ3262@mtj.duckdns.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20160621165740.GJ3262@mtj.duckdns.org> X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: AM5PR0901CA0041.eurprd09.prod.outlook.com (10.164.186.179) To HE1PR0801MB1627.eurprd08.prod.outlook.com (10.168.149.11) X-MS-Office365-Filtering-Correlation-Id: d61a39b5-c9b7-4f84-d7b1-08d39abc74f6 X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1627;2:2i1fKQhLNdUW23WUQk0L6kcm2VS1CVSwaIObKK0a6oznudA6I6XCPX1YuLqc09nwPiuah0kzusNCY0OYeRbhv3wNVBoepdxrBVK6+TyjbTGVsq9dq2YjGN+km55aWIcrIUT1fhniC5Fp1yirQ9cQ/mlTu2cH58rIOAgZccZMWB6h7FjzoMNONfXKXcxQPxwa;3:JhMmQj9JwOffslY1+s+jQHPPOkbGk2YuPaFq814JW8FTOG9szMbLv/lyfylPwSjgeCmVL+67jfWrHLMLZvKcs9L8nKB+D4md3CpcXGyKaQww5bzT000ydFeMPBlJ11K6;25:3ZiPCdKpgjsXo9YWX7Xvx1kjNAtDGVE6RlJGsx9fsUvzVm7i53GKxQZpcaJbDuhsOHACykqgnGM2TSdeqGfwrCSOfN40Y/VdgB8M8gWxc1D+zvB7YHDobNTgjrhX21RAF4h3SZNrjBkHNpb/kdtVfvJ8rdRBPIYX1ygGJf+I0mizvYoVr01O+wPYOhconxRo8zlj9EV6u2GvhezFe3AiB4FkZvDpKdbyVfGI3wH2YqIkilre1jaECfe4/gkNt78yKfwlg7Qo0306YVDbgrobiPquy/CPIviC9BNEhNyxohdu2hHb5N5yM8dcSO2ZIEO4F9YQHLFr9R1di02NkYIwQE+EjeEllA88PzLOEuGZX8RflknUq+lrPqz8jiir3IHwZazrTgnXSo8LW7cVV1Pp0XR4DxGrXaox4xm9gOFg/L8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0801MB1627; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040130)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041072)(6043046);SRVR:HE1PR0801MB1627;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0801MB1627; X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1627;4:Tro4ADFezT2Mw+lJ8IdxGZXpL/ZOia27XMJZJaJQZy4JpNLjb52rXua0+pQibcUHPPQlYYlN1nD3YzzO+iNXC1WNGz7EPgqfdi+fYA89k+qeOU52PJ7KMi9ff/cC52CFGyU3cyADsdMh7hpku5mnvYlLrDB6r+1natIqiOzdYjxeIvunc42cOJTyzYMsgfHoqMuwHdFd6Mx178TdobYlZVEmA8aXQXUuBKcnstd2bxrZas4UUQ0kHQE/uoYHf4ziokg5zn3oAEqcTLERXI1RKqLEj/2H2zOfACasAgVZw32O/DQVW6DR8qSHdJza8LmQ3ZkQEZEm5YLSqHyq4UvqS+y+pA2Gloh8qcQ/xsHaUWoV8oG1HU0dcHcS1VqW5BAxxODHhLm8z/9TSl/OItYHbHKjhNg1/RjA6N8BqqO/FUW4MGB6us0/5ksUy2V6lpo08cJJOgSk9uYwc8DxIXVIKQ== X-Forefront-PRVS: 0981815F2F X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(24454002)(189002)(7846002)(81166006)(586003)(6116002)(42186005)(3846002)(23726003)(7736002)(105586002)(106356001)(8676002)(19580395003)(81156014)(19580405001)(33716001)(50986999)(50466002)(101416001)(97736004)(54356999)(76176999)(80792005)(92566002)(46406003)(189998001)(77096005)(2950100001)(110136002)(97756001)(2906002)(4326007)(33656002)(9686002)(66066001)(86362001)(47776003)(68736007)(1076002)(575784001);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR0801MB1627;H:esperanza;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0801MB1627;23:3OsAQZY6NRsEnod/Raqout7aRBRU3hhXNttqn8W?= =?us-ascii?Q?IrKw4CqAjv/4yVku1WR2ciAi7x5LY0fEVwm+y88BEEiUPQO7RUfY8qtbrpAL?= =?us-ascii?Q?+OHXylFyKuxATSxZ8emeZgosBwSAGVgUxA0sxjCovWW7kZpLSs2X+hXJ4jgj?= =?us-ascii?Q?aT9wvi783SoRB7NZBjWIKrPKD5K0kGvL07qeh7H4fxKjDk6+bfA55+1UlSQ3?= =?us-ascii?Q?wz+w1rR/S7h219BTsGso4g1OszB+izeROb0jL5p0iGpnixzJBvZivKOCvCy+?= =?us-ascii?Q?ohlwC5mGqCP7QQR4qL1R45pyBJY4vjHp07Z9PlenMI2kIIGGlctE/OLgfZnk?= =?us-ascii?Q?TzBnrWJasdSGPMXErPASwAFCV4I6zWhubEvq2WDgVibix5FGd07V9+uyucWX?= =?us-ascii?Q?oy/H/d3tQ/UN+rUd1qDWBr1F0N5ZEX+w4vBbE/OjxFeaBKzKR+up571L1o5/?= =?us-ascii?Q?w0m+E+Dmi1BPIadoXcFdFDrEYuocahLjH7kcPGr2c25c1bvxt0OFLJjjSncG?= =?us-ascii?Q?9lWpcF4KH1Xqgv26uARVGootFxJEpBdDg48+qTjZtJAATT4G7EfFiSis8TSn?= =?us-ascii?Q?/UBwLDH0EYgtRe+dU+05hquJMdPsNG66sdnzFtpiB+mvksN8P0cd23KiY1m6?= =?us-ascii?Q?ZALaXaL1MuzsulR0SeNdahYkCXY3RlaVrN2B66XpaFiSdlgjxiHrxkq0Nabd?= =?us-ascii?Q?fwhqfiY7mHCAGgFYv67HRIi/TXD+uiI3AtRotaCE2KtLKDjUS8Ifz3cPnV3S?= =?us-ascii?Q?UpfzA5feDDh4ogOJNDHjaE9YyX3ZIrmfAaEz0n8+Xmiey5T7gKs4pdUcv2w9?= =?us-ascii?Q?FIrCLHqumpUBh9rGK1OPjhImNBDM5MYXN5ZX6S78UPctFzi5gMaZX53fP4IN?= =?us-ascii?Q?AHDad05sogkn08viM42d+CTkKLdxO2arOkE8D+IHWVf9CxaN58hTB7oUWuAE?= =?us-ascii?Q?pj02Fjzh5QpF7XDGX4LtgNZDLD+dY+hBWG52OXREF0LsooTkTtLahRQ44Asl?= =?us-ascii?Q?EAucxfpQKEHWCpT0W/zxRLr01fDPxfI+Sfa3OY3iP4yYGbVNaJ68eLUqp9Ru?= =?us-ascii?Q?k5Z/xpwf2+mPyjMVMvyYl3o3cyc3tyX4ld1qtvozLPb0ftI3KL5nUUlZztLj?= =?us-ascii?Q?gKYWzEFRAY1k=3D?= X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1627;6:EVuTlO9B1oH9mPMgQcZTh9DB9BoWuve93fRd64vHvAs17OaxtaMjZEO3OZnRGbZIaszmK6toQ+3BRQYxmEHCWhxx8HvnlE5bGiBa+eY8YVRMk1uFppTvPoq5o2s0kIwUSjeDLPF4BKiwwerR52atEyufd7Cf6p1c9CPThTVKFIph330HRljrbJCZKP76ICfM6fiNlz9VVaNJ8aIiSAljY6LUm0FN2gC/vQkttKmdy2m8AjylNVpaUxxVqI9Uh7/bg0dwXF14AicRjRSbMubT7IYpZpUU4srN3UEpVhBHNfVaTKBP3uis1VAu87xeuzqVhgm09NXmSOitS9wVjFC4BA==;5:igo3+452EMaOmlpT+aYDfhRFPDNxqK9tHdJ/VOuFx8RkjE4IRdStJcPyreeW6330nmbF3Az/HUD/3mNL4B+HtSxF2kvOGZykPQE2FmOv0aJkLmMCQ3KmJspUsbJcgawCDpHspUkQchatvJLX3xajUw==;24:CYZ+yi2Bj2jl+ZO+Cj9Ek6ebp6a+b9FDAo3h2ZLqXPBTbQ2Gn8KwnaC7aUY8bDgT7UsQHiZ5KnQNrtZxAvTzyLVwOS+Uy+rBXyeuYdJ4leY=;7:g48oYQiyCyVg3GZP23/7yLbEXVcRNa0IHnvEQ9kDLvx8mD+9M6lBMc1PTmU6fkLArfC4v0aUoTEqFNIc1YQYFkP8rS/U/Uc6tqs4FD/9zsy8cjdosM0TexedA+kBVdMdmEWY2vsKCQ6NreFKshh0yJ7PV0lZwM+na3+L5UiYKgAa7Fi+mFE+FkNoZ0SnvG7/S5li2LRPrnd+IJ7s22h94MlMNkEoWpFuQxrl0K897K5ZdTp/eOfAiXl2ZlnSs3YXsDG1Am+hBnJhjK/8iXcP1w== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1627;20:+auIHzENk3UJU5ZtKpggbA9aDp0o0L41I9WJ4gd+/DXyEgNWzetfCum1Xke2dKhWlp4j2Odo1NL87ABxj4tjs3Sfe9+covEo0K+P6x9YgC7iBx2gUjfsvmkULopvhvWgrftD2uYDqq1PeJXWpr3ea2XkcUB3IaR0QeSrqhHXWK0= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2016 16:44:18.8468 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1627 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 21, 2016 at 12:57:40PM -0400, Tejun Heo wrote: > mem_cgroup_css_alloc() was returning NULL on failure while cgroup core > expected it to return an ERR_PTR value leading to the following NULL > deref after a css allocation failure. Fix it by return > ERR_PTR(-ENOMEM) instead. I'll also update cgroup core so that it > can handle NULL returns. > > mkdir: page allocation failure: order:6, mode:0x240c0c0(GFP_KERNEL|__GFP_COMP|__GFP_ZERO) > CPU: 0 PID: 8738 Comm: mkdir Not tainted 4.7.0-rc3+ #123 > ... > Call Trace: > [] dump_stack+0x68/0xa1 > [] warn_alloc_failed+0xd6/0x130 > [] __alloc_pages_nodemask+0x4c6/0xf20 > [] alloc_pages_current+0x66/0xe0 > [] alloc_kmem_pages+0x14/0x80 > [] kmalloc_order_trace+0x2a/0x1a0 > [] __kmalloc+0x291/0x310 > [] memcg_update_all_caches+0x6c/0x130 > [] mem_cgroup_css_alloc+0x590/0x610 > [] cgroup_apply_control_enable+0x18b/0x370 > [] cgroup_mkdir+0x1de/0x2e0 > [] kernfs_iop_mkdir+0x55/0x80 > [] vfs_mkdir+0xb9/0x150 > [] SyS_mkdir+0x66/0xd0 > [] do_syscall_64+0x53/0x120 > [] entry_SYSCALL64_slow_path+0x25/0x25 > ... > BUG: unable to handle kernel NULL pointer dereference at 00000000000000d0 > IP: [] init_and_link_css+0x37/0x220 > PGD 34b1e067 PUD 3a109067 PMD 0 > Oops: 0002 [#1] SMP > Modules linked in: > CPU: 0 PID: 8738 Comm: mkdir Not tainted 4.7.0-rc3+ #123 > Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.9.2-20160422_131301-anatol 04/01/2014 > task: ffff88007cbc5200 ti: ffff8800666d4000 task.ti: ffff8800666d4000 > RIP: 0010:[] [] init_and_link_css+0x37/0x220 > RSP: 0018:ffff8800666d7d90 EFLAGS: 00010246 > RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 > RDX: ffffffff810f2499 RSI: 0000000000000000 RDI: 0000000000000008 > RBP: ffff8800666d7db8 R08: 0000000000000003 R09: 0000000000000000 > R10: 0000000000000001 R11: 0000000000000000 R12: ffff88005a5fb400 > R13: ffffffff81f0f8a0 R14: ffff88005a5fb400 R15: 0000000000000010 > FS: 00007fc944689700(0000) GS:ffff88007fc00000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 00007f3aed0d2b80 CR3: 000000003a1e8000 CR4: 00000000000006f0 > DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 > Stack: > ffffffff81f0f8a0 ffffffff81f0f8a0 ffff88005a5fb400 0000000000000000 > ffff88005a5fb400 ffff8800666d7e18 ffffffff810f4c9c ffff88005a5fb400 > ffffffff82d23470 ffff88007cbc57f0 ffff88007cbc5200 ffff88007d013000 > Call Trace: > [] cgroup_apply_control_enable+0x1ac/0x370 > [] cgroup_mkdir+0x1de/0x2e0 > [] kernfs_iop_mkdir+0x55/0x80 > [] vfs_mkdir+0xb9/0x150 > [] SyS_mkdir+0x66/0xd0 > [] do_syscall_64+0x53/0x120 > [] entry_SYSCALL64_slow_path+0x25/0x25 > Code: 89 f5 48 89 fb 49 89 d4 48 83 ec 08 8b 05 72 3b d8 00 85 c0 0f 85 60 01 00 00 4c 89 e7 e8 72 f7 ff ff 48 8d 7b 08 48 89 d9 31 c0 <48> c7 83 d0 00 00 00 00 00 00 00 48 83 e7 f8 48 29 f9 81 c1 d8 > RIP [] init_and_link_css+0x37/0x220 > RSP > CR2: 00000000000000d0 > ---[ end trace a2d8836ae1e852d1 ]--- > > Signed-off-by: Tejun Heo > Reported-by: Johannes Weiner > Cc: stable@vger.kernel.org Reviewed-by: Vladimir Davydov > --- > mm/memcontrol.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 75e7440..fbb8ba6 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -4203,7 +4203,7 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) > return &memcg->css; > fail: > mem_cgroup_free(memcg); > - return NULL; > + return ERR_PTR(-ENOMEM); > } > > static int