Message ID | 148613856351.3612.4677356797620654769.stgit@localhost.localdomain |
---|---|
State | New |
Series | "Nested user namespaces support" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.199.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Fri, 03 Feb 2017 18:31:48 +0100 (CET) Received: by 10.37.248.19 with SMTP id u19csp648080ybd; Fri, 3 Feb 2017 09:31:46 -0800 (PST) X-Received: by 10.55.9.14 with SMTP id 14mr14209599qkj.250.1486143106230; Fri, 03 Feb 2017 09:31:46 -0800 (PST) Return-Path: <criu-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [199.115.104.192]) by mx.google.com with ESMTPS id d27si19726397qtb.11.2017.02.03.09.31.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Feb 2017 09:31:46 -0800 (PST) Received-SPF: pass (google.com: domain of criu-bounces@openvz.org designates 199.115.104.192 as permitted sender) client-ip=199.115.104.192; Authentication-Results: mx.google.com; spf=pass (google.com: domain of criu-bounces@openvz.org designates 199.115.104.192 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v13HTBRZ025691; Fri, 3 Feb 2017 09:31:33 -0800 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp0248.outbound.protection.outlook.com [213.199.154.248]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v13GGA96024636 for <criu@openvz.org>; Fri, 3 Feb 2017 08:16:11 -0800 Authentication-Results: openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=virtuozzo.com; Received: from localhost.localdomain (195.214.232.6) by DB6PR0802MB2279.eurprd08.prod.outlook.com (10.172.228.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.874.12; Fri, 3 Feb 2017 16:16:08 +0000 From: Kirill Tkhai <ktkhai@virtuozzo.com> To: <criu@openvz.org>, <ktkhai@virtuozzo.com>, <xemul@virtuozzo.com> Date: Fri, 3 Feb 2017 19:16:03 +0300 Message-ID: <148613856351.3612.4677356797620654769.stgit@localhost.localdomain> In-Reply-To: <148613817114.3612.6378821900442053310.stgit@localhost.localdomain> References: <148613817114.3612.6378821900442053310.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: VI1PR0901CA0058.eurprd09.prod.outlook.com (10.167.203.154) To DB6PR0802MB2279.eurprd08.prod.outlook.com (10.172.228.7) X-MS-Office365-Filtering-Correlation-Id: ef786bfa-ed69-416b-adf9-08d44c4ff694 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DB6PR0802MB2279; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2279; 3:CVXze+m2M9g/oXzvFrnrCU16f52qTDbt64cP3T6CngfPFTlJ2BgL2nGRUdgThftDQOVe6UMStQ5x6axxvR7pVqyNk6yCKaasojOTe0PuCL3RjYWbvX/GqaK9embfDOhppv2vbyj6rYOiDklHy9/KiCEwhFMlgardSuO8zXTh6TucYmXU6byiqh/LOkvSTC5OcV4VzNQr+8jbGW1RiP0Sw9YTdK+z7hKIsNXalUiqce7syHIh48zEnl9izBkDEcEOjhG3iCglT5HpNI/3LxAO7Q==; 25:sgQY586aLML/nuy5XFndYsD5ZFfMyrhRRfFJVcBZ+5/ZZupb8lb6EXLK3c5iYPV/g+Be+kWvyHbr+/L/QsSulQvqE1nR6yKhIIO8xy95bbH6EtasfTWf+R9JUAlUNze0hv0w+wGuyIUMpLboKOSs7VznL1K0IWVf95JWO8gS8G/qVP5dig/UG7LnE8Cd8b6I46IOAw+rE062/OIib3jUUvkekLenR4icCxVjpTLIpv6xHo+AJ+n68KDrm4mS6g5VaVpg+jEItZ9AuojTBM5FWoiuqyyYNaBDLOhc0tXpA+9+K9XCWtb/0G/xuPT1Vs+3QRBVCcaFEfqMF8As9WFqLlpnpinlQm2eCahEsbQ/wNcFE+zc1xHwDWIkGKer1h78POq7EwTkdS/Ox3WwVuGk1i6IRWntAjpr4cjunW+CQkhF9awg7Ydjsv0lQVl788u9uzX6MlfjZedI2+7NEDQHKw== X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2279; 31:C5Pof1f2SNe2hj6VG3ggZjD+KSgUf9G+IrHibPr35IW2f0ni119ZM6G9KsAHBeAH6aVT/zqigH8Hsoo9wzu+89ve68Q3AtZ7Sm9WAaiwwH1T5y5+B2Ol3WJRBdoyjVZO38ywJt5gsAnyZNJxSTL+CG3+2UvPRqB4Q+bAuGu1EV3wxUBR6ljJU4YmECEbt+nop1EXEdfWMsuZOLI/k+W4tWMvKS+xqAZdPJWN/ua57kprgNJ4yOFvbwq8MF8frFYBY2j42UbJlWRhhcwbQ8reOQ==; 20:Ex+3/YHXsyR71kE10i1WQIpFgT973HJlJdJu/BhDMX5965qpjLc62qh20XA0RIFWaM6xTUUAqC2eJ7kmXR3KSKiKw0zUlewdUOLXv94XKURMLypP6bHGDQvOkaFsTjdycXfcS3FMN9EAElQfJkzvcw2nuPO1UU9qZr/U+YhvPU8EMbrFVr2MWUTQPlu+aBL4TxP1jAk2421kpaX/fTbq+1YBn9oNKI91dZnvsM6n4kuGdXGfZZ9ckqLVshjWEUDmHVDYDlnzFApSDkDE0PkGwnS/9mMWK2lXJxPbfUFH32KpsXkgCZxePD7kWCbkazih/pXT5iqihmFKZ/asrFm++W7ZzoB+hn+1kx38bPbj+QUVFW+6HMNZBCK0grOBtpYctG9u4cA6ECBZx1daSeJ2+cHwZGb8KrIyn5poHuUqD94= X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524098)(601004)(2401047)(8121501046)(3002001)(10201501046); SRVR:DB6PR0802MB2279; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0802MB2279; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2279; 4:JTnXbOfu1+pWMhlmJDWUzofZigM1j1C+785v+tq692LtOg/l8Zpm+0O2f/CCBu7vh6v5tvcJaRt+JABvcMOMS6y+kmsJGcSMWA5v2tw8SAZARrT5cZdMaBhwZClK2W4QOWdTzWEUli05hzURJxssQg6Hl66omGB7U/7vFn4NldWjjwVqvNLOTZea9YMirhvA6mIGiRDDC1Lm732yhK3d9mm9JDb1VJNfV7ceb0jRx7yLGAO2nBdmb1ft3dpMpxPFU+WHzBeQVlhfnuWgqr5Y3SG+yQ+/6uo4ftbYTgcH9b9YbuDwUEi8TGtyNpYAEDndBb2DH0GL4Cup2uxoXp61xUK5ddRl+S+Ss4jPMV/GGnmSDvNdmHiF5y9PlDWcA0TmxXAw5T8m7Q33Mowk+gAw9A==; 23:S7IUwVRCN4GgUBm+BZ+A2/a63iRFhpV7TDTcrZ9UVioACIYhKBGvaqV7D41E6toibnOU/Z3LTRzAfHyszGDS1LNsDu48yeMfXZi7UvWI4uEjzpQfxvWflGRuWehv+RYd4yg/wutxnR33q0wKxhAcMw== X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:DB6PR0802MB2279; H:localhost.localdomain; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2279; 6:F2fCnnh6Yye0YLt12EyDhLqhfKqjK1Rtk5z9FVgEsTLCDxLUh7qfFK0LAbTyqrm5Yzpc5T7IWtccqntUucJMic2Y8GecsCZTnWQNtIC7iUAQz49BUUJWAPDJe/1xhn0D6uHdIVcQxqvc7RSD8OQJRKQtC5GlEUloPk1/Lehit5MUZy0F1cySmRMooz92e+9wQ1DbNEyglIUn+odNB+uwTLJJzgVLsrDv4OXwAdCSEVjz1+n+hFtICsN8mij+oL4z10wnGeDcV1/pLFKANZEzGVpfmRviMn0JfJkZl5LGUB+vANM2u9KxaThxKD7UTA5OE1EdPNCam6qrh3tvmK+liM9t6BoUfH8Bo0yP6wBtgb66IiGEDiAi+yYlAR0XNGQapvoMSL6l9pBLHc5b46wk9A==; 5:V7Nvf2oCdp9aKJB6p5eWp/93s/lC98mzmHMIovkY1THfRpSF2zseH0F+HG63J3tSRrSCY/u0H4ax3hXJmzvwumpQvbU3Jmlmw2VLRXCwi69kEUbp4ssBVhwXlZ0kdST43bb/j3hDgNRxg2aoJCdhFIrUhTTvCwoCLuAHMlIsees=; 24:jbKgb2HaxT+72C9EHt+xXtTUvhiWgmJQowgtXheeDjnpSbFf2nJjB1xW/QrkdrMA3cX3qMKe0/zxvzpqa+VbTTqvoJrpv7SAbj/Sh+w0dVc= SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2279; 7:voWHnUmZDi4bx5E13xaMvV4/kbVdF/r6p1n1yrQmw39JxPgzdvz8O0ikjYK5Du+vjO6tJgoZ71WvKWxGL8jUtHWl8o7261DfG7oZ3AsRsihe90+sVK/meBZcxOacGWkyRfNeBgNsoA6I3tTz84oT6TVzso2RFXYqZtn7OT7RmRkmSGp89T0bl48yu9nk7cx+kLit7sjbJzjt0Ga+FRh/WLTT6vE0QW6ZnwddR5dcfjwwchMctq9HhIR4rrgHmIwyQjZG3gCq1zVFIS3yZZqmOzszQm5QJ+TKP1PJKB9ueitHE6lFCttnCwGvZ7TM+rt/TjM03jYTgC4ouiKoJ2XycaxXwa0YPtEbgg6sa0DAIEj41aP47ABs180J0iMd72hIIJSjKJxR78lJ3Wv/ZWhX+5VQFbJi0/W/xy6qZ3mSyON7vRNZlL7L49jlLDtvcewwj3G5dPaYtyPjvkpRLSpfj1S2C/t+s9E6ReoiHfut1tqCLQFkocfBSzegnrQNDjbFHkz+Vp0neyZaf2jdoYtldQ==; 20:GbtOTaWC4wO2ogx8WQEvaz5/LzTlSsbNG3XyfZFixI/vgG/wNMIsJ1RlbP2SDIUtr35oMIy/9M29QtmyvaZOWulxzVd9Vd/+6KXAzUMjHxhUDW5a/QNdyqM5ZpXbJfwSToS1rgzM+Zv0AgOZg+oMsSNzXHuW1MuNwakP8Ou9w2E= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2017 16:16:08.3333 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0802MB2279 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.6 X-MS-Exchange-CrossPremises-AuthSource: DB6PR0802MB2279.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 X-MS-Exchange-CrossPremises-AVStamp-Service: 1.0 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKI; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: DB6PR0802MB2279.eurprd08.prod.outlook.com Subject: [CRIU] [PATCH v2 30/36] ns: Set target user_ns after create_children_and_session() X-BeenThere: criu@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: CRIU development <criu.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/criu>, <mailto:criu-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/criu/> List-Post: <mailto:criu@openvz.org> List-Help: <mailto:criu-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/criu>, <mailto:criu-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: criu-bounces@openvz.org Errors-To: criu-bounces@openvz.org |
diff --git a/criu/cr-restore.c b/criu/cr-restore.c index 07a966154..96e554338 100644 --- a/criu/cr-restore.c +++ b/criu/cr-restore.c @@ -991,6 +991,11 @@ static inline int fork_with_pid(struct pstree_item *item) pid_t pid = item->pid->ns[0].virt; bool locked; + if (item != root_item) + item->user_ns = current->user_ns; + else + item->user_ns = root_user_ns; + if (item->pid->state != TASK_HELPER) { if (open_core(pid, &ca.core)) return -1; @@ -1431,6 +1436,8 @@ static int restore_task_with_children(void *_arg) if (create_children_and_session()) goto err; + if (current->ids && set_user_ns(current->ids->user_ns_id) < 0) + goto err; if (unmap_guard_pages(current)) goto err;
Restore task's user_ns, and keep in mind we born in parent's user_ns Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- criu/cr-restore.c | 7 +++++++ 1 file changed, 7 insertions(+)