Message ID | 149391431339.11711.11615536784609391673.stgit@localhost.localdomain |
---|---|
State | New |
Series | "Nested pid namespaces support" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [64.233.162.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Thu, 04 May 2017 19:41:47 +0200 (CEST) Received: by 10.100.181.168 with SMTP id r37csp648816pjb; Thu, 4 May 2017 10:41:44 -0700 (PDT) X-Received: by 10.25.99.136 with SMTP id v8mr641217lfi.140.1493919704815; Thu, 04 May 2017 10:41:44 -0700 (PDT) Return-Path: <criu-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [195.214.232.140]) by mx.google.com with ESMTPS id f27si1817418lji.63.2017.05.04.10.41.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 May 2017 10:41:44 -0700 (PDT) Received-SPF: pass (google.com: domain of criu-bounces@openvz.org designates 195.214.232.140 as permitted sender) client-ip=195.214.232.140; Authentication-Results: mx.google.com; spf=pass (google.com: domain of criu-bounces@openvz.org designates 195.214.232.140 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 v44HdEmL002578; Thu, 4 May 2017 10:41:32 -0700 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp0082.outbound.protection.outlook.com [94.245.120.82]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v44GCBja001322 for <criu@openvz.org>; Thu, 4 May 2017 09:12:12 -0700 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 HE1PR0802MB2281.eurprd08.prod.outlook.com (10.172.127.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Thu, 4 May 2017 16:11:58 +0000 From: Kirill Tkhai <ktkhai@virtuozzo.com> To: <criu@openvz.org>, <ktkhai@virtuozzo.com>, <avagin@virtuozzo.com>, <ptikhomirov@virtuozzo.com>, <xemul@virtuozzo.com> Date: Thu, 4 May 2017 19:11:53 +0300 Message-ID: <149391431339.11711.11615536784609391673.stgit@localhost.localdomain> In-Reply-To: <149391383130.11711.10688749526056073163.stgit@localhost.localdomain> References: <149391383130.11711.10688749526056073163.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0402CA0019.eurprd04.prod.outlook.com (10.175.27.29) To HE1PR0802MB2281.eurprd08.prod.outlook.com (10.172.127.11) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7d29afe2-6fe1-4d45-b04a-08d493084ad2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:HE1PR0802MB2281; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2281; 3:gOmDrtNdgNUoiCFg3vfUzPtJP6JGBtUWcnam16ci6FNq8Yxp1VHBOQ4W/zkPkh2AXOXuWSgaRbDc4mUeYt2FvyEioXBqLZnjIF4XW1b8AM+h04yDA04qP8IATqZCBuxdL9TsPPWdnB/OHx6FV2mOkg5Le2EKjah9flioQc2QCkzt3aGap3j4T0zWr/t1QuTTCml3eGGwkEEiAJ++vDZ8GE+Xh0mLMu8s0UNO9W8rllc3oq5Q6okwdir21b2CNyMz/gqppuKaaZFcaECHWv9FV+icQMdAh862Vaj/Kie271yw/IC92olx/pyUhUr92CeuX0c29TuJGnsT5boG7Tan/g==; 25:g/Yk3jf59Y3s6JFkj9rHutR+Qcgmcn1//MT2cjl8Ec6yejPD/UxBbyjCMbqqovUjrpUQrHWVS6jE26c0tLT56tyBfkfO9ucQVpVzqn5tmy1Slxx8cG+IViHw0IhQwzXwrZ0eBYy34nSigD+Uc2von+3z/p3JEBo4IslQnWjt/XMZLwBdF1FE4thBGcgaHyKefRZyRveNvWpfbgQ/EGBgbRQOxx2JR+5hAEhsUepF0sXfk0y1lNuZtw+9GBI+Y6csN6/2p1kY+Qs0Jv9MJGKYC0FNFt9ztrSaQtB/lYrqlZeP6N6lbD+iIheVdbZ/MXb3toKb2IaCeIY7b6tZJEafyy5+9eknwr3dyT9prZ1lC0B7takd3JqnY4lpouzihx2jbzhym5ATKNmic1ZfqHsT48a0CNd7wVakw/WT8/rne7zg0QqGlIWXG0l86NDqa5nE4UkNBY4OLuhT3Gu++qGZjEmgmjoTeJ2hi8mwvn3KEOs= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2281; 31:9tABrobdK8ENB+D2kng85wbKrk446/XeWjEs9lXK192vphjghqgGkdJ4PIIraMhV0vldQgLUIrML8JRMJzCwbP9ubMHf4KiiEVR5qEiTrfr1B1tyWGqAwlwJNVaRjmgI/yf0tyQkjMMunkTRpaxK6cf1f58hUndRkBYkSD+quYHlhFgBhBi7rsWjx3XVnxY38Pfpn6BRgdA3Kd7jskpC5lh2lFu+mgiz9Dbvuq6NRMssOfGYRRnYasqrV7/QRvQwdqwLlUIEEE0kI33lKlRDHA==; 20:79ceVpMP+ZIUmB3fmf1oDQp6WPNFmTbgbcOytwFoKD4sWDerj/koFenAk54KIAYOmjMBg8cIloCSS1Rb6NsYxTrqP6xNVtp6qIE3j6HVe03cnBuU1eIAtCkzEoiizEWlOpe11m77rkAimzSd0LmcBu9joIbavO5KhDWiTTwV2QnRCjl+LrYCOIcrUy7HCnPUWFJCNSWxxa0TR0dN2o+Pj2PzyhCfFC0fNWvvWLNvPUCSGch/Jz5bNv6UQrXshzoFY+Bmv6Vorxsf4qSKSnOJ/s7QiN1WuIjelIWRe3wsm2TtrAVytrIZjV0XsV7YEoRy9rO3f4mUEdB7aCAPEvTQbPGMZcL0VM0CV8pRAK6TBhSWKa32TU7fDUj2M1iqNoe6FqHihpI7hI+gk+S5DcrSwTzhumGReZNaQoENvvzG6UA= X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524173)(601004)(2401047)(8121501046)(10201501046)(3002001)(93006095)(93001095); SRVR:HE1PR0802MB2281; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0802MB2281; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2281; 4:kYVrbNBiMFGKpSMlEf/ZIiRXleSgJ06z1s1PkFjLa8dx9ykdZJxhFgT3Sk6JF7o8op+TP4Shk6pBBS9J1CG44gGaRFMt7rzuKmJTZdT9uemz8xuNc79tDYmtsdxFsp5idNcNHIK6tgJJCVJAl3LC4qShIjLZ3nI6ssRCtUEO8TRnwSxSsmy+ByuHO5CfWcmGNHO++9BglREaBO+rjkEtKGKbU/XF9Jrs0SVeA47rc/jO6oxBsEJ+Ldrs1DlaPzYCknnVW1Q55sqdfCv4EV78u44/02BVJin3BIH5Zf2GHUDgRMDF97TCoeeveSWjgoP1vtJETRIF8DOlDer1CnQS8B20JnzaNv8cG9CB6PdL7jpd4gC4A5M9UUUJNlEiBqVk9laPolFatf3YHDQTwsu3+SY3klw5xl4yTB1GuxBGpPPf2H3545FcJS7+zx4VolPV; 23:d4InI0L9D91ItTUssV/zyoRTkDQCpZEYyGevyHwUrjLuF7XwO7fvdLgTgc5iMYPFV8baxbnbHRksIhijpmoE27DwehlOhd5uWazsaq+t4B1A8xUvCSoxetTyCHxFg47cjoC52CpCrFEmENwv7e4PVg== X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:HE1PR0802MB2281; H:localhost.localdomain; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2281; 6:sox8hl5Bf3z2sXKCRAVimztY22hVja7ypzIyvR7DWDnicJBe8xrEbTeLJyoI/gNtSA+xXcvSDY1HM4E8Fmxbtmmehi9HXDI40ZJrxwGPGVY9kEdskXc4QTxsgyaWYUpMwgU8dM+YDGOUs0PiPubiM/5NlsxS2OXL+/HEpMlUPt7D4KQ2rB/mtqnjp9QDME1SyE6JpSd+I/SAp5oxmiCe/RH9s0IiuvzTsH2aLQUfO2UgFBtn5KkD5nFhVQDWZzWIwgRTfWrXC+yL1sEnHmlVpsok9w1JgJvVatXRrd3BpMFja2dtZFm8yy2G9LI2Y4thHOx16zSih9svtt/4zS96vTvgM+gwdcZCwjioMqnu78IaMD2QqXLIsZPrf+OAiaWjf+vkExvp+B2z6FD+zPfK2Q==; 5:ehwpeQ9YonIGytgGLZtqQ3mm8VFFdt3ujDQEjOgY9bkOHaBOfciLQlih9JASJSz0AyTl+4u0X/ND1nXEBZUJfGeCMmwtSdwVsjHEg00DXCjlvztc49klx5gRIMMUdLXd9W+BQBiO2nPEPNylf/2NSA==; 24:iOEaFWpOjzb/e2MC6QOxYimFYSs/ED7IhwBzSo33gz9MMTVavr51wmFjYlXHvaEPluLanKUdv+QNbwUUr6Z3J66scHNM9so8mqncxfU5Xfg= SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2281; 7:FR62mbgm9R9oDJkavICBf5EuyRnl3uBzpjFQBIblrVhOGJbYOU8osk9e/+riAyt/1Wrc9N1uSXzp2fE3MLrIg3Z12eWCRRkstEAZYU/HiPkGksH5WiPTVw4WfTgURH+HDNPa/3ECeURzNJWwmmSD303yF6FYS2uOXZxoZAmZdphuA10FUGh7ZvYG1Jsf+mPNXtxUrIPkuNwLQ7RAIetic5dfEAEsjYs3gIO4QfN5NwmjSnaVDpEQNQGqTcQgp18NDYDqGLCAbnekO6ZbtpGEWdgrFGDVlDZqaC2oLoP3Xl2//LdUv6oGUhjaLK1kfysPuPWLFgv9I1nqoyuLcb+Iyg==; 20:oDPr8fx4RtDZq57hoKKKNb8r/Pp78TSjMxSCg+jGyuebq4U5bLh14khz+F+gtjcaX9Im2pHOC8JhC9vSMLqQB6qTH91kwgn7lr4JJWiwFIaqdKregeCrsTaUAVaJdBGYpfvfuY46rVYOMmtQxxA1YKZvR12uwtdPJBjTM4M4wh4= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 16:11:58.6932 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2281 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.6 X-MS-Exchange-CrossPremises-AuthSource: HE1PR0802MB2281.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: 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: HE1PR0802MB2281.eurprd08.prod.outlook.com Subject: [CRIU] [PATCH v4 39/41] pid: Check for equality of getpid() of child to last_level_pid 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 7a184b6b1..425f28922 100644 --- a/criu/cr-restore.c +++ b/criu/cr-restore.c @@ -1685,8 +1685,9 @@ static int restore_task_with_children(void *_arg) } pid = getpid(); - if (vpid(current) != pid) { - pr_err("Pid %d do not match expected %d\n", pid, vpid(current)); + if (last_level_pid(current->pid) != pid) { + pr_err("Pid %d do not match expected %d (task %d)\n", + pid, last_level_pid(current->pid), vpid(current)); set_task_cr_err(EEXIST); goto err; }
Make the sanity check working in case of mutli-level pids. Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- criu/cr-restore.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)