From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757983AbdELQLo (ORCPT ); Fri, 12 May 2017 12:11:44 -0400 Received: from mail-eopbgr00105.outbound.protection.outlook.com ([40.107.0.105]:57160 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755960AbdELQLm (ORCPT ); Fri, 12 May 2017 12:11:42 -0400 Authentication-Results: suse.com; dkim=none (message not signed) header.d=none;suse.com; dmarc=none action=none header.from=virtuozzo.com; Subject: [PATCH v2] pid_ns: Fix race between setns'ed fork() and zap_pid_ns_processes() From: Kirill Tkhai To: , , , , , , , , , , , , Date: Fri, 12 May 2017 19:11:31 +0300 Message-ID: <149460544264.18650.5677597682925453388.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: AM5PR0101CA0022.eurprd01.prod.exchangelabs.com (10.169.240.32) To DB6PR0801MB1333.eurprd08.prod.outlook.com (10.168.11.27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d5dea5e7-ad13-40ad-b963-08d499519190 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:DB6PR0801MB1333; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0801MB1333;3:WmvFaY3SvxHj2URHLC1cOGIoKP4fhuudwjSwR2u/DqSkeP/PwRa/+qequtwVDcfl3ApCOk3HOlgAUBgEfn3tVaftYl5Jb/q+XuzI6f0WyEfkKl/O1UC3SXZhF8XDtPx7iuweIG+A/nXYTFdzORAC/7OmDuVn0QQKBj/PGrjmCLV51W/IkwuOEx7qS3llh6l8KnB5k+H5ZYVhCkiqmIygwvzGRI7DHMbSpD7ep41HOGjp9U2IJCj1a9CsHGr0QPRs+8Y+G30lXpVqmjmBeqRcn4GudYhizn722AtpVpiKQgzdwrLEi1KZwFoT9VTjSWBMJvy5cjYHpGe95mfO96SzBA==;25:AqsB1zaSOM5STeozOfhdSiP8Zkj7WTcT/2T/2ludt5v6YAEGavRY3iQzaHOuMDtzJz/lptrmqIGOzBbjBVM9IYnGY3doknqncpE5X7uIpXMbMg34upw30a10ZfLWN2K/0K20LAAWA3DcYeu4neef07fbfIyHFLpfBInhEZqVjJV5wjirF25RU46xzWerdxospJ33Hl3QVPi+ky3Mh3V17ZhA0jzzuGiT8O1T+KNc5/Dcs39RAntAfyp0Da19+oolv1JL/xuNPoyS9h7MNuTN2HrkxmO0R0ukCuoM906DCbZ4cbU5NQBTVNL2kfKY1ojCyS/9pJmwkFKWhIXS4s92dmG/flaquoLN4drHowG60eTcmCdoUnmlNqdghgNJQhv+J1aTgQ40hj1jO92+HmP71x9y8fKebVJmPKCZeYh4mSMCPXwo3hzQxfFcI07RwQC9v4DFy4hBfebQUm1hW+zATL3wzUAKZ9Mca24HY7Vamys= X-Microsoft-Exchange-Diagnostics: 1;DB6PR0801MB1333;31:C0LaIJO0VH75OIvpByM6LS1lPq/yC34R8SfPQdgbrUVqFVfb6n+s0fG1jh+NLhLzbfv4vQuMaRikUiJrFqYD51fbnnOcnBOFdctdJL0MhQ/l43uz4lcf4gFRxg7a6XPH0z4zqcMRACeE7zfyfNLoqGpSphvssLqWbH7LVxI/8RUNu9ResyZlUkmvRth4bhSyHC855TPZ9WWVB1nQ/KjpkT4k3cToAeEiaypV89uOrOE=;20:erHVytTiOEkzijZ5F1l4dKWejD5wbnnMKMAA2swIKUz9zexmSoIYGl1otr6ex6adwaRW8MbaQRYBiUcqnX3QBPKCjdjJUgujhFrMFjbJSiiiDS3q5vwjeb+W3r7zb/iyPyLWvfEvSZ+U2wZ3I/DHJbogsNPAg0CnINpOPUMXC1gaOhDWmzaruQNriAsgQGu6gZ/KJdLpJjdeKleKXgb40nhD9+gLFIaWPu82u2/eYC5k4gbbj5Nk2Azre75vJMM6srGinsg9tHHAQW7WFctI3kgCjlvcrg0bz9RC7FGGMVDNNUy9Azr9o4A3AHfJkR4bfmgI20Tz+HPCabrxSjvzmRSyPqN0Bo1tScxnRI7oj4PouzAeRZhNpe74HS6LLldNFjVKRRKJwQ/KYG5sKVg0mYqbGnb8F8gtMKKq1kCKBJ0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(104084551191319); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6041248)(20161123560025)(20161123555025)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148);SRVR:DB6PR0801MB1333;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0801MB1333; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0801MB1333;4:Spps3lecYhSqh8ZQNrr32ecBBn55W86xGJiA8CGmzaGpKxewKRLrcW7wEnH5l+ToiFMpTS4/mEEd5mAqVg3kTnUgDaaNnZ3JkVpxn7hgcQc58WBx5t/Bmk6lW3ANDQow2/tWi1sTBTNLcIe1wUTlG5fLWW1x+KBwRdzsfoIsPT5Hri2n7N5w6UZNllHDpdAIu18cnuC9pNfVhq7PJ5dsYWWbiE8+3GdgZc3huKp04SQGxQa+Hn3POgTlVY8qNzn03ep6NGRTLaZ7YfEz6R3ehM3ClVHIgtAi8w1CN/KjFr60qcyyXW0YSCwQeccRXV5ohxTajudc0lbEqKRC9vsGou9UzwLy21RXY2XWs5q5wHtXYHhe2NLQ0Q01lIDfcgzkEUD8B/y0xn84qilv71uEk49Klo+XbEAG/+RipuVfOabbmO/bpB7rwZQgWxv0cIpDEo5gan3W6wv0roywkQDBncGieG4pFtbY6kisGwr4XBMlbTuw0BMmKxl7r5T5hKtk/jR8hrfio3jQ4WKigroZiPdymPc0vRvDnId9rJcFhf8inz1/Uz7jeu2Cua6cJWAeQf6UzVfIV7YtKK9UKnbGXtUKAgASyt/LXuHr3w61xNpkdVdIXhpnaRmc06w0Hi+lEXronMxlhFd9hNsbmOiK/QH4k1ansx/8cdCXJnL0YHO2gVOkyRDeQJjKg3+aAUNjjwWhxgyureyVi1DW6zmf4Pzq3RRYGfbK8ZoKZnJRXyDnSY6aHCmWoSxJdT+uRllF9ZANc07jSN/WotbrH0gq8jkFlVW8+tQo0XyeW8yVuEffAy3n9UUGpJWwT2X4la6X6DHoGUKXO4zTqrRo34VKZQ== X-Forefront-PRVS: 0305463112 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(979002)(6009001)(6069001)(39840400002)(39400400002)(39410400002)(39450400003)(23676002)(7416002)(55016002)(61506002)(66066001)(47776003)(5890100001)(4001350100001)(478600001)(25786009)(6506006)(189998001)(83506001)(7736002)(81166006)(5660300001)(305945005)(8676002)(50466002)(6666003)(2906002)(86362001)(2201001)(33646002)(53936002)(42186005)(9686003)(6116002)(38730400002)(230700001)(3846002)(103116003)(50986999)(54356999)(921003)(1121003)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1102;SCL:1;SRVR:DB6PR0801MB1333;H:localhost.localdomain;FPR:;SPF:None;MLV:ovrnspm;PTR:InfoNoRecords;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtEQjZQUjA4MDFNQjEzMzM7MjM6NSsxMlkybnl0ckRNUDR5Zi85L2kvL2JS?= =?utf-8?B?UGJkNHVkVjduT3VCTW5ROEJrSmJEN2NjK0lpd3hrdnNaNkF0OEt1ZUx6SHFq?= =?utf-8?B?aHNEZ0VIR2R3SVJ3Y1htekxRcG1vQy8ybUh6dHFKcWMzS3RubTdHV2NCU2Jy?= =?utf-8?B?bGVmUVdsTWpXd3NLYUVvNG9VL0RycXppRWEvZW9veXdsRkZGZWRQaFB2RC9a?= =?utf-8?B?akJMQUJLbkxPQmRZOXlkVDRpRjVDOXVkTkdQZkZhZ08rTS9rNHhmNkdJcDFP?= =?utf-8?B?NUF5YVFxNkgxRWQxYWhYYUV0QjFhamwrMytpWDBUZ3VqZVVBUHlKcHNUN3BI?= =?utf-8?B?aEI5TGFsV0Z3MmJxdWI4VHgwbmlrclVjVUVBT0hkcExudi9tR0RZTUMwQllh?= =?utf-8?B?WEo5VDJhWG1SZU9sY3QrWWN4c0o0U2VRVlc4YVlpUlU4TFoydkhWbUhYckFn?= =?utf-8?B?YjRBN2Q5S3NvNGNNOEo0bUhBTGd3bmsxTHlhck9Zb0F4Wk1GN2s3bGFocVJ5?= =?utf-8?B?M2N2NnN5clc0UklyYnJJR0k0UGdZVjArTFdtN2hEeldDT203RkROMGZEeTRH?= =?utf-8?B?WUhTbHBjM1k1NDc0bjJuSHYxcW1ycklmRm5sMUhEZDZIeXA4R0doMEJpbnJQ?= =?utf-8?B?VzlLTFRWdnk0NVpWNGQ4TklPYnRST3JPRmYxQVczZ0RITE1TZUt2bWEyT1Bk?= =?utf-8?B?SWdjcVRQdzE2R2c3S1JlRi9SVGRRVldFZ3lqV3BlSS8vdVczZWNGNkFlQWFL?= =?utf-8?B?OXlFVWtCYi92WTIxVmpDZ3FxYVJZUWY1R0dibjliV3ZHRXJ0dXNrRjdhNWtL?= =?utf-8?B?aTl5VGF2Zmd5QnQvVWNvbitWa21DYkU1bDRzdjlSekR4QzVsS1ZQN202UjFG?= =?utf-8?B?N05NQkRCOEs1dkJ3Z09zOUg4VWxuaWwzMVpiNmNVT2pSbTBXOFVyMnFLRFdO?= =?utf-8?B?K0Jtdk9rQzBRQVdEOFdPOEFJOTN3Smw1UEQ4WCtBNXc1Q1dBaVVEd0xEYjIw?= =?utf-8?B?S0pBK2JKc2ZuOE83QWxIMytVVkF6RzJXZXZQOVRqSXBUWGVpTTNRbThwVlVY?= =?utf-8?B?L0FhMFFadnJqdVlENi9VR25Xd21uZnBYa3FpQWxzZmpUUzQyNEVFRmtyeUU3?= =?utf-8?B?UHlzM0ZFOUtTZGRzbERROFZJd051SkdQRXh1K01Ed0tObmtacC9TNER0SVJE?= =?utf-8?B?TktLS25va3M1ck43bFBnWllCSXBIV1JOYTV0Q0FTeGx0cGF3SnNuV2Y3cnYy?= =?utf-8?B?RldtYk5scVRvenZqTWpzS01iTlp5ZVBTM3Z2bm9BL0o5cGczZlh3NkNKU0RR?= =?utf-8?B?QTFMM3NVeFY0QmtvWjJhdEoxdW1jQmJWQTVBd0dOYUFqMW5VRjgvUnlidWo0?= =?utf-8?B?NWRWWWV4alZSdWovbjZyN3p3Q05FbnM0L2NKc3dYcnFvZ08yVVFlMVhHK01D?= =?utf-8?B?cG9wNlBJVEZMK1BlVTJ6bTBmbEF4bGgrbkdMK3luQUtIazBhOGRXdnZXeXdK?= =?utf-8?B?TzZZWDFObk5uTmtTd2s2ckJrdUluZTg0cnFxU1ZtOUJyZnFsc0ZzS04rVTgv?= =?utf-8?B?Z0IrcXZzc3lrdXIxa1dBWDNzVHlvRGRMTTNZcUptbitQeW9oN0tjeEJxZkls?= =?utf-8?Q?s=3D?= X-Microsoft-Exchange-Diagnostics: 1;DB6PR0801MB1333;6:rlsLegx5H46GZJkhYY49n2nlMSHVDdxeIv0sYfn5VILwHY4FPrlmncyzTwKz8Sqyv6xGmDHcDLfkzZZG7SXc4eMHOLJumuZZS4PhOfjglLkv7Lt+1NzDn4qwFM6U8c15LF95jkS2XYnwXFwHnh7CbxsxsHLqwsH6KT9sI/YRfR+C5Tl95CyeNz3wBuGPZxy8gMvpEgGpMOMaypdGvn5bXmkEIXgriH/HxPGMnSmrljgVByiOKmVMosGKQYMn6jaV4rfo16PjE/ORVFatY1sppYQmvo8nXCJcr7yCNaoWksNsVUka27hpJesuTSuQxJyxrxHJgJs4XYfT3BVHt1LTPNUuov+5DgsKWTBXcVMMj6cdLtFILGP49MEOZXjJwSThE3grnq+WDJ92APz2+u9aTFOYYnrjLPJ2xEHAVuey+oxA8OFRVjrGDpoCqK/T5la06sIRUK/fzT1/UfDsZuOMUx2Oqnv+qh/lWL2s3Abg3SjICTO3XGpz2TRQhO88TFAx0sX+/teeXiY7KmtmfhcqEQ==;5:iTHIBf8Ek/6MBTw1ZAQkZv6WTRPViCIXcBvNR+Nd+zQwjJNV6lis0rfCA5p27W1lncrGgXRI7lHNseI/ce+5t/BJHjmIX20dvxmTA2dOlceAsIzEFmkAbiNzExR2OKVvB+L3/J18eDhl3QdIVhKVZA==;24:9yOfwmhkX+ziczEdCx1c+isU/JAMvP9aduNHM9vy6BJku+2MI1TRsTs55RNbzCJ2FpehZ9f95cIdtrtjh84+P2upvGYcQbgeLbIFq1F574M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB6PR0801MB1333;7:0lfEQLhCrtpn6amdsMkY2fszQ9FmKm768aaZwvY0iDaPp5nvMFNXCApiuIOmM3SoTJiSNzp5np8Oe6u+RU0ooHqLzSgQcUqFgx4mPfnpz7TOZxWMRCoKbrhB1xJKlwCLu49mere1Rlp8BJ1YZbze/2g7CoEELgmPdS7n7MtU9FRKL31Sxf1Qm9bj6Cz13P+94hdw9m1IQzK2oxQSFCNqmjP7cPgrPgKNgIGgoI2/71RIetYcHAuS0pbyxQLO8tYzu2xmjSZNT15Pv2DXIZO8zMKmNXLehXEaPfMOsHz5chDIsVdGH7g2RQTHrm2jqKVTU642gd/dzqjYlhLEaurjfA==;20:P4VtBAjELO7iAlzuZt7UaURsJRsKooAT1+mg6ZJswtJsWBimBx6AemRvlhsuOCl77N88qVzTZFBWm01DOjMcD7W+c9MiwK/Fm/wRoxVPgUwnev1pmZhAOXVHhhU18sz2DlZnj2wKwhFuM8lZdSM2AAZ77nGTNnx1e1wr9vUhg40= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2017 16:11:36.9507 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1333 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Imagine we have a pid namespace and a task from its parent's pid_ns, which made setns() to the pid namespace. The task is doing fork(), while the pid namespace's child reaper is dying. We have the race between them: Task from parent pid_ns Child reaper copy_process() .. alloc_pid() .. .. zap_pid_ns_processes() .. disable_pid_allocation() .. read_lock(&tasklist_lock) .. iterate over pids in pid_ns .. kill tasks linked to pids .. read_unlock(&tasklist_lock) write_lock_irq(&tasklist_lock); .. attach_pid(p, PIDTYPE_PID); .. .. .. So, just created task p won't receive SIGKILL signal, and the pid namespace will be in contradictory state. Only manual kill will help there, but does the userspace care about this? I suppose, the most users just inject a task into a pid namespace and wait a SIGCHLD from it. The patch fixes the problem. It simply checks for (pid_ns->nr_hashed & PIDNS_HASH_ADDING) in copy_process(). We do it under the tasklist_lock, and can't skip PIDNS_HASH_ADDING as noted by Oleg: "zap_pid_ns_processes() does disable_pid_allocation() and then takes tasklist_lock to kill the whole namespace. Given that copy_process() checks PIDNS_HASH_ADDING under write_lock(tasklist) they can't race; if copy_process() takes this lock first, the new child will be killed, otherwise copy_process() can't miss the change in ->nr_hashed." If allocation is disabled, we just return -ENOMEM like it's made for such cases in alloc_pid(). v2: Do not move disable_pid_allocation(), do not introduce a new variable in copy_process() and simplify the patch as suggested by Oleg Nesterov. Account the problem with double irq enabling found by Eric W. Biederman. Signed-off-by: Kirill Tkhai CC: Andrew Morton CC: Ingo Molnar CC: Peter Zijlstra CC: Oleg Nesterov CC: Mike Rapoport CC: Michal Hocko CC: Andy Lutomirski CC: "Eric W. Biederman" CC: Andrei Vagin CC: Cyrill Gorcunov CC: Serge Hallyn --- kernel/fork.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index bfd91b180778..d2cade9b6ad8 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1845,11 +1845,13 @@ static __latent_entropy struct task_struct *copy_process( */ recalc_sigpending(); if (signal_pending(current)) { - spin_unlock(¤t->sighand->siglock); - write_unlock_irq(&tasklist_lock); retval = -ERESTARTNOINTR; goto bad_fork_cancel_cgroup; } + if (unlikely(!(ns_of_pid(pid)->nr_hashed & PIDNS_HASH_ADDING))) { + retval = -ENOMEM; + goto bad_fork_cancel_cgroup; + } if (likely(p->pid)) { ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace); @@ -1907,6 +1909,8 @@ static __latent_entropy struct task_struct *copy_process( return p; bad_fork_cancel_cgroup: + spin_unlock(¤t->sighand->siglock); + write_unlock_irq(&tasklist_lock); cgroup_cancel_fork(p); bad_fork_free_pid: cgroup_threadgroup_change_end(current);