Message ID | 20180712204145.6494-3-avagin@virtuozzo.com |
---|---|
State | Accepted |
Series | "Series without cover letter" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [64.233.164.109] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Thu, 12 Jul 2018 22:46:14 +0200 (CEST) Received: by 2002:ab3:1a94:0:0:0:0:0 with SMTP id 20-v6csp1272ltt; Thu, 12 Jul 2018 13:46:11 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfbyT2Q6ECL3mMfKFZ8i/H+sMXlfJBicmngvgOwrin3b4NNTOi787HnULjSY+1MSR3XRQ/w X-Received: by 2002:a2e:5f5b:: with SMTP id t88-v6mr1589794ljb.140.1531428371686; Thu, 12 Jul 2018 13:46:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531428371; cv=none; d=google.com; s=arc-20160816; b=cXoB58cXaYe21Hbaho7s5bqKSNT5Gxnatt1wRj4BhyiypV8RyeiupMJCrbNs1SMLBK 1TPgn/OqmsVZQIbX+fADcMZEONuEVyrvHoVuXYSelEwDYLRgi119L89D646A5/g0QzPB 6fXJUib8bumtxlzwdo1eP2se2y9T6F8VMyldEB/LCVG7dlg/B8+mnVlPID5KTjTXTAuB 1Qi6WVFa07ukgqAqkXe/vfnHG531YLfjygaJ7KZSE1o+0yfSpRL+gXV5MtjNgwjKGLOb 2zetoJjeZxMBoENQ9S/M2x4xLTUIPbS7wcjJiE2XVxoGGnDqGmsqBj2XT99vpQT1fTzS gRlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:spamdiagnosticoutput:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=A5OZniQ+dVz2QQTatX7diedknKUm6cabunj0s2TkoMc=; b=XhV3TMJoCM1YL8KhLqaJnkuXw7duHnFqfNzlHnWIpe87fS0nOGrzllmVxm4Vd3bRwp rExLySeqp1UcQQZD665N1vNLd0ikpEww3VIbusLRYDpPr6EoppLrrFlH2AJX2tndXlY7 s3lnJFqRG/b4R6SDH/HjOiS1E/gIAtd6TIDyGAkIsRkDCicsPN02tw8OAtn2QLKwB2wQ T/4jUl2180YGirLOYq0cHWX304H0HNyMMngjURNnXD7w9y5wHUeMfEkgOm1ewVBzbOO6 qbms/ZztzUcM2ebxZ6l3PRopmRNMaDZewa8IS9iZX8/Gtl0Zepinc74WElNhWHcW80dJ SUbg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: <criu-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id u127-v6si8665116lja.335.2018.07.12.13.46.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jul 2018 13:46:11 -0700 (PDT) Received-SPF: pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id w6CKipLD026510; Thu, 12 Jul 2018 23:44:51 +0300 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 w6CKig1h026485 for <criu@openvz.org>; Thu, 12 Jul 2018 23:44:43 +0300 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 (4.16.175.162) by VI1PR08MB3262.eurprd08.prod.outlook.com (2603:10a6:803:3d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.21; Thu, 12 Jul 2018 20:44:46 +0000 From: Andrei Vagin <avagin@virtuozzo.com> To: criu@openvz.org Date: Thu, 12 Jul 2018 23:41:44 +0300 Message-Id: <20180712204145.6494-3-avagin@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180712204145.6494-1-avagin@virtuozzo.com> References: <20180712204145.6494-1-avagin@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [4.16.175.162] X-ClientProxiedBy: CO2PR04CA0124.namprd04.prod.outlook.com (2603:10b6:104:7::26) To VI1PR08MB3262.eurprd08.prod.outlook.com (2603:10a6:803:3d::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 051fdc25-dd62-4879-6a78-08d5e8384e3a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(2017052603328)(7153060)(7193020); SRVR:VI1PR08MB3262; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3262; 3:+OptgKJW6T/U+FfyXrnbTE4vu2q8vLH1jqJoCranr90q3eTDz35c/2RgOWXWr/YcRenOVfQIhss85MrnUMA8pAcDGkWEr66i9C31x6ZSRjRG8Tf4CiEUGRKli/JRUmxNrrpg8vQW4MdVmDRMTfkEmhLwWmnZvths5i/AhnjNmnA1fjwkG99z/ty8MuFDIJ2q8eBmvxlBmF+5+A0sabqP2aqYCoDxFapCGtwRbExLqUBDnn9ZMAkx8LANEhUMdYoX; 25:y4FJyxAAPfLx6Lxd4EM2pQ3XJh3faWosBGEuMGY0eBkaLDWuiyuRBFuGbqH7oIWgU9DWMxh0n6Db0t9ftOPP6fEE7ANcn/hF95ddetilx2pri+ATNjgMRS/6np1ZbqP3qNXZ8PJ0hZKdBl05dLZZx3cCVfsoajA5jnOf0JOeIgok8DPcmdAeQskG456lgYq1VyKk27J3SGi+iiRWK9OIZI6pYiMfofRHLMlta75ZhGhK6pIlDbnMWcu3gdp3lpd7WcPo+eqmPFRnrmxjInGuLDI8yjt5Fg4V0/9T9M61T0BZZBtTClj3CDRKkbK80VP2TnkTR4tPk47y0gJw3n7F1A==; 31:l4zq5HBM809MN9wMCGSnGMmg1Q5bkghVTCNElRJpmNaeaWNNPYdjOQ1UQGb8eImXF7oc4SbIZnEqAFmvAHpbd1JXwGHYdEPSqxg7wxQo9CxlmLTKRO0HQ3TonihHj0XHtQBP1JZT3D91Vqb4CpZHI77zN+AE7Pg+WQcSNKevpqbRs8M0jS/B9PTZ49DFkO/QqtYi6S3XEClCn3djbuVxbCWmfkMmPpl36pZLyzi4nao= X-MS-TrafficTypeDiagnostic: VI1PR08MB3262: X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3262; 20:Iv9b6HSDjfaRA1Fw6b7vrRcSMxXscYjWLfl0wvm/YKaJ16fXeJ2g24vkfe6K2MQyjyELMDZg1PtdPXN9oHgnxJDM7BTU+6Ii7NOjpCtdhMTYeJe1iTw4ykm/YiuuGFY789mUCl8v11Wo6t8/DCAdfvH8VJE1R8ZU0l+iU42BEfGza/dY4cFZpP8aptIgIyzCuBqEyE42pJOa6FTqoBFpB4HdAbIOgCboukBBFWME1jQduDutS/MdV+ojNyFOLOblDgyLbFNzkk8QgJzTUyXXFo26j8OEQ2qtizjsyh6WULa54ngFqCZMTI8jRfDM8LXPxB1wkXDViD4xsl1c1tfxuWgn9C4154jEJBDrDLIoucHJa71NokjJ+pENeSJBPQTvUQQQOv4ixV1lxKGU4w3vgk9AMHDBWP1c5UZWetGR+WUfApuS7ORtc/P+nDbGc2LzDil2V73T80CnmtIQCcfvF4qJQPXfsQ34+h31DwzRPFBdutUuFltU5j8ubAO62uNc; 4:T6jvm64ez0kt9LJQg6NNjMwrQbTnV2faJE5Mk6c1/IfljERoZammlKbeUgUwj4bOZ8C4CemN2K3/EwE9fdF7uFCYcouDp5OjYtiF1u11ogEltdiullrLCEGCj5138dGm0PhzbVLEJnQTWB7SQuzjxZcdtWS8N1SemZOuvm8vTI3+hsuT+rpovYtyNqJGAopiq9o9d0oJInz0aSJME2XcB7xmKr10KoHgzQsDdrI4GNAbKvx4F5+igpG6y8+qBFlHStmHr0PYY0aks3q5snST9w== X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524173)(2401047)(8121501046)(823300264)(823320095)(10201501046)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(201708071742011)(7699016); SRVR:VI1PR08MB3262; BCL:0; PCL:0; RULEID:; SRVR:VI1PR08MB3262; X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:VI1PR08MB3262; H:localhost.localdomain; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3262; 23:+xHItDBzXe4pBonctGmBM6SAUUUxpmFlHd+wk8R2UkuhwdfHMUlm2RqZ8Elbd9rizKm6lRH7NLSm7+jgLhwptJeiARnVA47p9H//eSizsF9FGxdZLnqNyuaVUHAhFLV5rfZKVex9N8njMe4J6EVxkA==; 6:vRsaWZ9loLsMb8Il0vzjxMJeTtP0hZwwPAJpGPQDP3V2dQhj9jkpqo/ld8189YuoKxBcRYRASQuITzsv7Vv/FfJfANkM72iM9/wEKkTOY3ckKXcEJBRMLFCukqpvB7+zQq/mt5DSkFZY1hlP5xmx8HKGWbQ7ilOkyPrt2tmScChHwUax7Emeqtdwku4Pj1Yv6wWQKfSJ9QIg8mEUmJCwYE1haG93xMTxbo6kw5YF1gFBUKOcXkZ/tqhQSfxTSGnt3IcoiwpWe+zNSOl43CWBcw2zXSfsD6KcT1eUmUAUoFzrCnho0zfRt9KxPZaeqSk9qWET4gr5XdczAqMZ2QsB+r+i06U+qpxvWm0KPGTLbIvg0KsxyRvg7r8DznxYN8Allefmf3Blwvn8jfA1IwoG+PiHbfRnTaUYpJXRA1NjyQmptp5PxOSx0OsvI5G20JfwhRtT8S1jo6zfsbwUgH/KOQ==; 5:5zSCfcIH+VQ9DWMrxT0fpF/lWHBXRrBgjJy9wQVToKjLyIhWfC36cDzpKSgDZqf5PNDzRwJXLVvLW+qCGV0sCOfDncyHKbi8gpi/pxYfEgZxVB3ifyneYxi7pYun2xf38fjQ7nAC+5i/ourSp9h2SmcedUhcYrBir9qRB9kduxk=; 24:ajdtYc6l7Nzonl797TLlPCBFB1TkC8BiV+M1DMCtaJDWaCk5faUXWiYw3VkcHWh54JCpF2bHE+SUdLfdBbXmsydQBfcqWa0EnmJG+m/+7cE= X-Microsoft-Antispam-Message-Info: T5yNS/57juUFwewun6fsN/pXG+fLHOz7y3fOO27Mvnh72HIQq1YQ2m1t/myo8aRSx52uVC2xkZzCfP20+cUr0DwK16+kkltEf27qpg6YYUWXT9EfZhNto7QrF7emF8vcAbx5CFBt/BlXS+RCTKmoggjo8qIPuWeeucC8UjOAL43UkOj09eAr8ItbaiqwPAO93gvwXXBTKKAzO8RhMabcjAoYlx77FL3YAqx0AVGFd1aOVHjd/E8v5jxsDJinsg87kd/Qa5Gvpuh+ThJGGAyFGvwMME1aDbjTHaZmRXX24Pcuua26HK6OGehfseYVSKNfaEE2ieQeg7W2kq3GdK12XYWjBJ8oMWxWQKIVGTr9f1U= SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3262; 7:kwlDrK+yJEKJsnbW3PvjJLslG6KTA2cz1Ti3n8ev+ncwW21oAnAdS823Ib3YSi97/EEV+xbTmK6qWLwuMUBRWSwG+E36QsjeddGjtK1irG+htgw0VV8Hj0PHtjNKER8HBQIf0/SDWRHs/nUr/+r1W3cfAmdClzjgDVtZylJcBBR00OW+NovvbnCxp+lk4wWlgb5oY5Wy2Km6xEHa8+vXqBKaT28lBuBNvox66TAeconXYBNb/myrEZauheE5DdN0; 20:gALlOZEf5qH8IQjH4ZKB2Rd+1hwfgvcmCjCZNzotae1O2AJN+MJtGRqZSSrP89IryML66jNHOlr2s+zF/6DPf/9rsLG8Q+hnE8adZPHJU/IzknGB4lgP7gs9w8YE0efOUim6rQqaeUrMDhBvcaG3mTz1aXbkxO/7Ax3WzY0m7m8= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2018 20:44:46.2841 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 051fdc25-dd62-4879-6a78-08d5e8384e3a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3262 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 4.16.175.162 X-MS-Exchange-CrossPremises-AuthSource: VI1PR08MB3262.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: VI1PR08MB3262.eurprd08.prod.outlook.com Cc: Andrei Vagin <avagin@virtuozzo.com> Subject: [CRIU] [PATCH 3/4] mount: don't dereference pointer before null check 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/mount.c b/criu/mount.c index 9cc8f6e94..f347a2e28 100644 --- a/criu/mount.c +++ b/criu/mount.c @@ -833,13 +833,14 @@ static int resolve_external_mounts(struct mount_info *info) static int root_path_from_parent(struct mount_info *m, char *buf, int size) { bool head_slash = false, tail_slash = false; - int p_len = strlen(m->parent->mountpoint), - m_len = strlen(m->mountpoint), - len; + int p_len, m_len, len; if (!m->parent) return -1; + p_len = strlen(m->parent->mountpoint), + m_len = strlen(m->mountpoint), + len = snprintf(buf, size, "%s", m->parent->root); if (len >= size) return -1;
CID 190775 (#1 of 1): Dereference before null check (REVERSE_INULL) check_after_deref: Null-checking m->parent suggests that it may be null, but it has already been dereferenced on all paths leading to the check. Signed-off-by: Andrei Vagin <avagin@virtuozzo.com> --- criu/mount.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)