From nobody Sun Apr 28 07:43:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1675706902; cv=none; d=zohomail.com; s=zohoarc; b=oD/wqUT27d3ofYv8/8J29KnszO22qSD2ia/aJmMXnY1tr6GsUL87FmE8SmKvJ6M3UsU2Ll7ukkjO2NMt8Eh5zWd9HLeVz/UmIBiNoxdRhUjrUtwPY1qYSAQxey4MXpI4A1+ncWdf+slwuvaTxKC2yA4DdF0y0z0iW/6LKTLPSok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675706902; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=zp1ndla/oas87qdgM8kYzXuq4/e71809sMTqnyTniXw=; b=JR+JmwHkIU4ZehnEJwGxwj3QA4jrSbSXgV6+x4L1x/9XEoQ2dP2mBWVvH5IWZfHk1PGsyFiRMwjj5z4At8ImkG04YthUaThZpr+v/4s1ewlHCHw35QbFDWERqXK5ZsW/yWng35gcRtSml9ksuUs1sFz6xgzeOiaoDhhLsK/ihNE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 16757069026911010.7127027368501; Mon, 6 Feb 2023 10:08:22 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-347-viT9hs7lOEC4BZ_moq_nxQ-1; Mon, 06 Feb 2023 13:08:19 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 39C983C10680; Mon, 6 Feb 2023 18:08:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16DF840398A0; Mon, 6 Feb 2023 18:08:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C4D78194658C; Mon, 6 Feb 2023 18:08:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 75AD81946589 for ; Mon, 6 Feb 2023 18:08:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 555821121319; Mon, 6 Feb 2023 18:08:13 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C1291121315 for ; Mon, 6 Feb 2023 18:08:13 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 292171C189A2 for ; Mon, 6 Feb 2023 18:08:13 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2043.outbound.protection.outlook.com [40.107.6.43]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-149-OSo0baCbMRee69WhdJ2b5g-1; Mon, 06 Feb 2023 13:08:11 -0500 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27; Mon, 6 Feb 2023 18:08:08 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f%3]) with mapi id 15.20.6064.035; Mon, 6 Feb 2023 18:08:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675706901; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=zp1ndla/oas87qdgM8kYzXuq4/e71809sMTqnyTniXw=; b=ZdBbcQydXaRrt3W4QzQIPor6it4v3O6z7Y0h7hDeXXb5yNeO9SSb42fokwJcC+freuL7nq AmZu6aaEF6e2CegoCw+0PYjo3RuuUDywdyjCXqW/YMusZRbAbaY5hrkIoBor2sq81OK8pz hVcr6vmm7Lyl+cRaMksRxoBGgahtfSA= X-MC-Unique: viT9hs7lOEC4BZ_moq_nxQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: OSo0baCbMRee69WhdJ2b5g-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH] qemu: Jump to cleanup label on umount failure Date: Mon, 6 Feb 2023 11:08:03 -0700 Message-ID: <20230206180803.4340-1-jfehlig@suse.com> X-ClientProxiedBy: FR3P281CA0128.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:94::10) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB4899:EE_|PAXPR04MB8510:EE_ X-MS-Office365-Filtering-Correlation-Id: 499ea68c-ab05-4f2b-a7c0-08db086d1934 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: PyZHPI7vil51N89WWACZ8fscjzZ/bX6VBnC4BWPI7L86XtCVmep/zj/SHSkqtJZVYyAUhfZOl1LLN2WYxWDCA5Ij9R++y5hDUzyqalrBiFYjThVgfcz/bcWlCeg6sKUu4osalCl4ZzTJ6uR0zit4lk3hakz3qBOx8XmOHgLxDZgCebz8F/6nE0w4KB3I1upCxUc5sV7RbCU+OhEWgVNiDtJInomuLHfrf/L4sWQtvPv0vJtuScyDn2FA7Aenc6PDdu+pOfBFW+M6agrlax6sItM4yuJ413fyykClp+suS4I4f5/OloRvzCSuDQt+zbGyvqe+cKQLFuIglPZoUL8LWitPjBhgYgdmFJyDu1suYxvFtVQu0bSXO039I9wyAfdmBHIGYTCgrhiSOdhO5u/zbsAp/HJ2EQ2GPoNRiYOGAmEGHKulfXQWGKU5bC2H/5f8TvvdkDN7xt3jAsRUwvMrzkbLNNvWrYYvuzLg7CtntRx3dQ1IeWSq1TGPi8YcfXM8DhzYB/sU0M07G6aPl9Vxeee9wXTOGLjF3fNzMhVEgsxmcFcJx5tZy3q1FgQGvMn4ccAWLRbK0ilpN2P7ETPsXlzXIiL4SVw27XAahN9n/O3kJdiT1r5SqTStho0c3GsDTDWB4X42W7/q8ekOdOGQ85fTFvJesl88M0eW/ZVfKAmTG7RJTsIBWWnuzEboxZXR X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR04MB4899.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(136003)(39860400002)(346002)(396003)(366004)(376002)(451199018)(316002)(86362001)(6512007)(36756003)(186003)(26005)(66476007)(66556008)(66946007)(5660300002)(8676002)(8936002)(6916009)(38100700002)(41300700001)(2616005)(478600001)(6666004)(6486002)(966005)(6506007)(1076003)(4744005)(2906002)(83380400001); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6IXWHIQGgty4JQxh+cY08J9jZJWeEaETyT/I0jD7/CFEdOLuiq9YLJgrlygG?= =?us-ascii?Q?yPF3c/rs43fuRd5TGQeElALrNMjkY+guxQbq3K9WUb6gHb+OY8gsc6A0gBhx?= =?us-ascii?Q?yLI9WPofV0/iPHq2q59ziGvfV5wRxMbsurx7hzQUWyEcEfRjKQVW15NOTAui?= =?us-ascii?Q?2CLD4JuxKHszNFTQcJXkUq+vb8t6sHSdLUg7Hx48vbeRFnUl9Eyb5tLQF9hh?= =?us-ascii?Q?NKgYCPkAlEjn3D2zWmMXdxPCgtmnPO8j/zx0mV8fD1m/d65/MPV5q5SzOLPg?= =?us-ascii?Q?s/K7e3iGc2sjct9KkXjGPKKa5lHmlgkVNctHP4CvxAR+zxMQ6JfE2v2n1lEC?= =?us-ascii?Q?q5QuZ2HIT52PrVXO2bCr9fBGrJwY6P7WgeTr0iXJgqGuwXc1b7dHYxxm15Ra?= =?us-ascii?Q?W/jsPdXReBFZ+GPFrGwLQLEOQW/dcx4KKs9U03YdVpffYaOc64wiT9M4XpX+?= =?us-ascii?Q?Iv2ReKgpd2dGpv3cceLNGd4ikOmRjFdNtCm+GRqr6QPShFGCdv5eKvPxmJw9?= =?us-ascii?Q?bVqvKrElIntLf2RV9xYdDo2mUALd+YwgbedewXevcLWV+/vYNcNbJhiDDBqC?= =?us-ascii?Q?WVYBiaTstDEogHOydep+rmCQ7uPFw3V2VN0yjcq8UWjUDiz9ohr0jeq1Dl70?= =?us-ascii?Q?o0hT1T3J7aDkLJii/lzGani2ES10TmOxKaYf/V+PG0OQ99cS1AO8PZElKZwb?= =?us-ascii?Q?rbaBNE3Cv2aUfLtW8g32t5Pd4jyO3lBuv04xr9IA4QEl8Ipa5407a5aE0Lu6?= =?us-ascii?Q?UI/OSy45ggMz3UwXbR1+IA+7ywkMTVI5wkpHEuXILQLSWOnmtZyzFLD2yTd7?= =?us-ascii?Q?/KyHNSBa5TiDJtTPBiRRHn+p8zrwtDsbLs2SV1Q0G7L/jIIUaFR2TQTfqusG?= =?us-ascii?Q?D5+nsJMR55mRtiTZJFNQAjAvEQi4yE8Qq22EyixX77frvJrcJAJEYLCdMOBM?= =?us-ascii?Q?qOKbYoIL1L3UkgOIMH7rtngGg+PDLl9pC7kkSvPfJUDQAVPpQygQQPFtxCkL?= =?us-ascii?Q?j6bYeI2TaAV5qwA6TeqwNI0CjCLQYqtMbbNtCR5xYoTvWgSKsaAkazzA27wM?= =?us-ascii?Q?bkTgfm5OB3qgblKFnrYcXseirqpzTMIkWx/EI2gt/UbqS9FGOI4ApptpER27?= =?us-ascii?Q?1/wZusMawerkxHmtLTEqEz0IlJpwT10WRfyqfaeDYfpchPjV224TjY5YjXf4?= =?us-ascii?Q?BkLI//ikxYUiHJOoq9iMtwGmzys8wCjExtwrQ1obDIwIY+UryAp9mGDJg0ql?= =?us-ascii?Q?Ry3vGHEUsb0dy7ZuULZjGaj/g87yYAb+qIfucjsrKwNNxKv2FfBTTPDGG9zD?= =?us-ascii?Q?KdjENo41bvKW6cUObzZbPPW2HE7mBev9Ij36ZBLp5Dr7qkAsBuuqbmeTUZBu?= =?us-ascii?Q?tt1qgoGy74Nf8elb5lzlXUdl2YnYbXdi48Jh2hVtLBtx6CW1cCgOFO6sV30C?= =?us-ascii?Q?feg3+VgXROIAwigHdQ9MN7sF0r3u1n4BjadqHZP4P8ayBmdQGgRAdNyl7Qnm?= =?us-ascii?Q?KL+9Ts+ZBrGHprWi8U8t+u5E4mzcmRo9Il0xuL3VCedGfULctu7HlfeOQF55?= =?us-ascii?Q?Of1Bf/5BvHQAgaLVwD/k2a8xF/y9bxY5iA68AvT5?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 499ea68c-ab05-4f2b-a7c0-08db086d1934 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2023 18:08:07.3364 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: B6HmdShL6evVg17fWT35isWJ/W3yHQlq4UZPyRZQG5e27ByHEuqGBjGfV2qCCw0sK005zQmxqmmcls3ND8HskQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8510 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675706904594100001 Content-Type: text/plain; charset="utf-8" Similar to other error paths in qemuDomainUnshareNamespace(), jump to the cleanup label on umount error instead of directly returning -1. Signed-off-by: Jim Fehlig Reviewed-by: Michal Privoznik --- I noticed this while looking at a bug report containing the error. ATM I'm = not sure why the umount failed, but have asked for more info in the bug https://bugzilla.opensuse.org/show_bug.cgi?id=3D1207889 src/qemu/qemu_namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 5769a4dfe0..833313d5a6 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -779,7 +779,7 @@ qemuDomainUnshareNamespace(virQEMUDriverConfig *cfg, #if defined(__linux__) if (umount("/dev") < 0) { virReportSystemError(errno, "%s", _("failed to umount devfs on /de= v")); - return -1; + goto cleanup; } #endif /* !defined(__linux__) */ =20 --=20 2.39.1