From patchwork Mon Jun 12 11:46:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13276393 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EC1B6C7EE25 for ; Mon, 12 Jun 2023 11:46:38 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.547061.854250 (Exim 4.92) (envelope-from ) id 1q8g0D-0008FN-MA; Mon, 12 Jun 2023 11:46:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 547061.854250; Mon, 12 Jun 2023 11:46:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q8g0D-0008FG-JT; Mon, 12 Jun 2023 11:46:29 +0000 Received: by outflank-mailman (input) for mailman id 547061; Mon, 12 Jun 2023 11:46:28 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q8g0C-0008F8-0v for xen-devel@lists.xenproject.org; Mon, 12 Jun 2023 11:46:28 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0627.outbound.protection.outlook.com [2a01:111:f400:fe0e::627]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c3719919-0916-11ee-b232-6b7b168915f2; Mon, 12 Jun 2023 13:46:27 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by PAXPR04MB9424.eurprd04.prod.outlook.com (2603:10a6:102:2b2::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.33; Mon, 12 Jun 2023 11:46:23 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e442:306f:7711:e24c]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e442:306f:7711:e24c%5]) with mapi id 15.20.6455.039; Mon, 12 Jun 2023 11:46:21 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c3719919-0916-11ee-b232-6b7b168915f2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cuBb1RoVDyFLwaSn2pW2mdhS103q6yLgOy/dymeMaq/6vbJATYYM8L/WP1xmRtbK5+O4uNT8dFOak4OMWC7mH3HU/I67paXlVEntc3iz8ku9CsjcF3GV+PqvOdoGLRAhk8IB1Fda79fdV7kV8jG5cKwfdYiOTqcHypxpzstve8cHDTIx1JMIpHALk8LlywZYDpm7FbE+Gt4cDhdM9WGFflJnlsG85eeh+oPEsOGntZ2aMshsCdhSCqbNMkkV9+Tdr4/JsxVu6A7/1sxHVQiYm2IyfkbKOanDbVFw622P0ARBLU0XszHjAUeJ2Io17aGfE4p2/CLs/teIWH6vwWrrTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+dDuzZO3NY+2JEelv9HlCc27GL3IfXBwOaXL4IVoUlc=; b=Tgx4oLAGyXtu9R+WofTZ1vIT2GoJVcxQAN8E2tc1TU8i0I6pQoFYBiRTTsk+B47GocdxiBRKMmBW2x+xxBS298QJCU/7muajlfIkvHyA6IVQ6eQQULAMlpRSMXZ+0IT+Jxs/C2jX8MIOZQO0R/NL9gv9OevhfrOm6l6hbammN+50ig1lamLCIsIsd+9Z4bvVSfieES3jo/GmXAUhtbGGiPHqzbhmro2fBxFFyuUVGmpAL6wvknGhSZ3yaxLXcEdGvcdwnkKyxJbrCnIiEC4bQ54BcGf2mXTSLcHJh1qsKQg9voLLZo2vkTr4hT0TkPQgiHgnsO2Tb3zryWrxhPQ+Qw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+dDuzZO3NY+2JEelv9HlCc27GL3IfXBwOaXL4IVoUlc=; b=0PxbqoHncnfKxb0EkDIuBDlElfqDg/52LjB3Hum7awJH2xkBWZ45yuG50rRMMNLTQf5AKQbatkRITggZhFuyWe+cX1i2+HGPW8BrS3v9TpP8pC+D9fi0wSpBuEINZmRU/n0HH0bOY1mD1wY3dItfoiIkwC+MMDITp9LfI8javGKjTZoB8PMmVr/owKnexTobhwnjGPrqrsZwqVO3hmWHeUZhfCi2nN4QqBfR+oWkzR8XW77Ys1//ePru+sAjQJ8z8c8cRa+5fj+cSid79ljEkz5KIGHZIseYqheLUqwr5wvbQsyH2FrCoT/GqYR0Ztx+kI9qtOIPtGy5zgVJUTBCBw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <5eda17da-7185-9cf6-7e87-70da57aa0ebc@suse.com> Date: Mon, 12 Jun 2023 13:46:19 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: [PATCH 2/5] libxl: drop dead assignments to "ret" from libxl__domain_config_setdefault() Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Anthony Perard , Wei Liu , Juergen Gross , Daniel Smith References: <2dc50b58-a4e4-3e32-1876-94412b14b052@suse.com> In-Reply-To: <2dc50b58-a4e4-3e32-1876-94412b14b052@suse.com> X-ClientProxiedBy: FR2P281CA0095.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::17) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|PAXPR04MB9424:EE_ X-MS-Office365-Filtering-Correlation-Id: b886b6c6-6e15-4515-cdf0-08db6b3aa47c X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1a9JzZS1gVN6MoesZUCHQqmbztcsCmxJ176c184Z57bQ51Nr4d8AvzKypk5GWhcfTx5Yw7pDLc0rTixQNQXz7H+qXY0FaLUEYGiFBy71ee7AmA4sZno4xY2oPdfPOTrL8cUqMcpYV5x5dEr5s1s+2G1Pv6it7JaVdTO6tx0LVyYnlkrUOue+/zRP7JE6wvu/rDMxpDK1WKdAtqXhvIguMk0/wL+waenZan8IY38IEfIYrk/6vBIpk0Kdb410LlqdztHEKYUMDDj0NQ5/4+Dv6oOazpeLhxGZF+gXDWVPr1mCtuy0BxzpYUOW9vr4dFqQBhdlPsWXCnSvRnxQh418DHNVC/W890qa31nydzTo+wOn0yJa9YUpBuxPpJgQdocWoQTtYkUBGOyrvB+b5Ae4fNeGngIFmrjwu9rI0TnOskRggseQikBWHBVmRHoClzRluXx4OfiqWQOXgC2jE1J3P0tqcSiJHuZFDbF83iCgJ43x7vOkzIdy3WQCg9gPqYLCr9HifINLUVqJ216/IxEUkdi2w6u4nszFJXpQLWnM+xBS/bK3b78sVTbTtVuwkxfKLF60mCAJp/4FGqsfGx1h3DNOPNW07fSY80+RNOScaWT/z6uT1SMYZXwPl4jhYILcSI+4HRvuLIszhmqPEHlYDE8Lm5qm3/iWD294CpyPv9WX2lc06TbuRZmH22K9laIx X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(376002)(346002)(136003)(396003)(39860400002)(451199021)(478600001)(8936002)(8676002)(54906003)(6506007)(5660300002)(41300700001)(316002)(6486002)(66556008)(6916009)(26005)(186003)(31686004)(4326008)(6512007)(66476007)(66946007)(2616005)(83380400001)(2906002)(38100700002)(86362001)(36756003)(31696002)(101420200003)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?1tXuhm1V2slB/+2gdESh71MSjjaY?= =?utf-8?q?ib4g2r8ODOpn2VClbeW88upJDaaeB1n0o/90WoSoy4hUu5vCtjhzrmJRCiCZqKSsx?= =?utf-8?q?HClB7DuRDVC6doj0yb0ZVyQS6oAFLVuJLo/n54Ngng0t2oazxvd/eYdktjywXTjCv?= =?utf-8?q?bZ7g/JigP3nC+w2rCj1nVj0r7urObLyk/dLPnXSYCZhZj0HR6bhZKJdxL9oLiT6w3?= =?utf-8?q?pXvR+uaE1pnObds7zsmk5fAACC2BZeicxPQJU6raVNZuZ+XyXqVUqxmbz9Jatdupa?= =?utf-8?q?XYwpkPMLJKxQPRtt+B/TKvfw1sA9l2JN4+KfxM2iIHJhJCsUm38ITSRUcpLttGEzx?= =?utf-8?q?2nwTEbVBoMcciym69zeU6deYXXF/uhTk7Nj3QxO/dQGNFG/HISrHcJ/xghsVeh7Ey?= =?utf-8?q?az9tjIsuG64k1uqanMcWIl7x+VYzBtIHOYpZhREwpVFJdjEzgmJ14t8IhNFAjnjhj?= =?utf-8?q?FYyuk35VaY5U5pykHXkRzICXPgAHzIcu0mtFNe6DuSyAorA3r60NM+q1dJvSDE3Jf?= =?utf-8?q?76sCL85b1ip1I3Yhi8nym+9ZiM/0jDLjbC8HZGAYKwLBRVZwLJcmo4nXiMBq9GUj2?= =?utf-8?q?7Z8zCp6NYUSCZsAg/I59ml4FR45YfO8qv4vXksuKChbEPGsjkU19DRYCtKWnhSJUS?= =?utf-8?q?EZUqWiPh8BNLx55kv9s3HteXkRSfd+pvbJBhae6LN/umgdCR6eTyvXLgTHh5v35ai?= =?utf-8?q?llKrcp0+GQOmiHdmOXLkOEW+sKeZztx0OAL1DGQEGAmT8/cknsMAj4CbF8iE5iflI?= =?utf-8?q?KnA+crrHjM7WfwvR0Rqz3mH2miA7+/5ZC7hIFfTjhce/x8jJ2+ovVywtWHKbISYTF?= =?utf-8?q?HWrZPLlf90vuu/YpRXMcRgDlb0d/h9SPuuXCAmez6SjaLm3pWhrI6gquXAnqZ70g+?= =?utf-8?q?Hq/Pt9pbIezTfzGOBfCP0bvuvVzDYbWys7xMJBc7EoA9AjsYT0GRHQs1oGXUzjxz0?= =?utf-8?q?6391dkAZESNvz+oyahwv85KjZf7YX4kB74iqWQdyxP9tWVPtU03o/T0nu8gmjPP8I?= =?utf-8?q?bZHtsdhIJL23eNsb3SPjUVKyo/0mMZtWOdR9I/NqNbgDyMRDsVQQY0kvxv50estZl?= =?utf-8?q?hFFMLoTAMaNDMjCXhalBk5BUnhUDjqdnYg37wpJY6URA2v6iQ2jihg/pXdgfzL+rV?= =?utf-8?q?QzNeb//apV7sqan5DSQPCA6iOS2r+B6IToo5VyZxxsPudFw/C2xeiKL2Ay8ih4O1v?= =?utf-8?q?hIh68qo0iEr3wmPA7Ck0vwUExEL7RatC7igmIgUS4DmZrwS4uzGJuN5/TvkgkKTn2?= =?utf-8?q?TtsXuaWK1CV1X1wwYvaCLNYbc0E0KxkmnOY6MwDUT4Bcid1z2WN4RKgTjra8IEvsm?= =?utf-8?q?+7HJ/U1d20MHDR1H5+8OOhuuyod96CsetPc+0vrbljplj7LhUmh9p9Dw/ILOym0ar?= =?utf-8?q?1Y9+aG++Oxfecdgp5gbZe8l0QZGZ4aSSIAwToh939QMu2xFlxIoJsN/XwXv54CLDK?= =?utf-8?q?s9mOtOs7K7ckwi2Xr9YuoGxjk2AuZJDevkoty2UmPx76vlG687YZQBP5t8u7qgd8r?= =?utf-8?q?wnhNW4aU2U1H?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b886b6c6-6e15-4515-cdf0-08db6b3aa47c X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2023 11:46:21.6682 (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: ftxTKhRU7ShBGZ0fgaiRi1IUAKzVMDjTlt6cjH/4Wqm1TsSOmzeZ8BopzhCb3u4hSDYISFseHi/e2l6L5P+QaA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9424 The variable needs to be properly set only on the error paths. Coverity ID: 1532311 Fixes: ab4440112bec ("xl / libxl: push parsing of SSID and CPU pool ID down to libxl") Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross Reviewed-by: Daniel P. Smith Acked-by: Anthony PERARD --- If XSM is disabled, is it really useful to issue the 2nd and 3rd calls if the 1st yielded ENOSYS? --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -1081,13 +1079,12 @@ int libxl__domain_config_setdefault(libx ret = libxl_flask_context_to_sid(ctx, s, strlen(s), &d_config->c_info.ssidref); if (ret) { - if (errno == ENOSYS) { - LOGD(WARN, domid, "XSM Disabled: init_seclabel not supported"); - ret = 0; - } else { + if (errno != ENOSYS) { LOGD(ERROR, domid, "Invalid init_seclabel: %s", s); goto error_out; } + + LOGD(WARN, domid, "XSM Disabled: init_seclabel not supported"); } } @@ -1096,13 +1093,12 @@ int libxl__domain_config_setdefault(libx ret = libxl_flask_context_to_sid(ctx, s, strlen(s), &d_config->b_info.exec_ssidref); if (ret) { - if (errno == ENOSYS) { - LOGD(WARN, domid, "XSM Disabled: seclabel not supported"); - ret = 0; - } else { + if (errno != ENOSYS) { LOGD(ERROR, domid, "Invalid seclabel: %s", s); goto error_out; } + + LOGD(WARN, domid, "XSM Disabled: seclabel not supported"); } } @@ -1111,14 +1107,13 @@ int libxl__domain_config_setdefault(libx ret = libxl_flask_context_to_sid(ctx, s, strlen(s), &d_config->b_info.device_model_ssidref); if (ret) { - if (errno == ENOSYS) { - LOGD(WARN, domid, - "XSM Disabled: device_model_stubdomain_seclabel not supported"); - ret = 0; - } else { + if (errno != ENOSYS) { LOGD(ERROR, domid, "Invalid device_model_stubdomain_seclabel: %s", s); goto error_out; } + + LOGD(WARN, domid, + "XSM Disabled: device_model_stubdomain_seclabel not supported"); } }