From nobody Wed May 8 05:52:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1679481017; cv=pass; d=zohomail.com; s=zohoarc; b=CIYG1AgA1xvOLBvNGslFHNpw3pV3EatNcZ5flBjtZocite/UpdDWgMV3LcdjG1cGWN9ynSVOj4u/eNsbGCgdhFSVngP18VJfCJl5/zKQJtX2V3rEBzfecid1byl+unjs6+a9s6TS/u7HDftxT/Gr1LWsjcHBBzf8vD665I3rtQg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679481017; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oEHhl4OfY4C4g8mhIFlhppd+WY7/WJjjUQxWu0Sbqss=; b=Q4UDKg5iS7enu4T7MI1GPhTou7c8PkzFOjWCSNYl8B/ZtqOWLLNoAkYf/YKj6HtTWoi8mnWoHfkQB2NbszePzA1jBecvFv0ncYJBaxcvbaRzcp2+9n2PaMqu0WwqDmR3U68phX4UO2Xn5PttEXCY9GO+fBXqYIco9EgoezlHeXE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 167948101766092.31168341361149; Wed, 22 Mar 2023 03:30:17 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.513301.794130 (Exim 4.92) (envelope-from ) id 1pevjE-0008Ll-Cx; Wed, 22 Mar 2023 10:30:00 +0000 Received: by outflank-mailman (output) from mailman id 513301.794130; Wed, 22 Mar 2023 10:30:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pevjE-0008Ky-7b; Wed, 22 Mar 2023 10:30:00 +0000 Received: by outflank-mailman (input) for mailman id 513301; Wed, 22 Mar 2023 10:29:59 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pevjD-0008I3-3K for xen-devel@lists.xenproject.org; Wed, 22 Mar 2023 10:29:59 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2060c.outbound.protection.outlook.com [2a01:111:f400:fe59::60c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 7c01f873-c89c-11ed-b464-930f4c7d94ae; Wed, 22 Mar 2023 11:29:55 +0100 (CET) Received: from DS7PR06CA0008.namprd06.prod.outlook.com (2603:10b6:8:2a::15) by SN7PR12MB6888.namprd12.prod.outlook.com (2603:10b6:806:260::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Wed, 22 Mar 2023 10:29:52 +0000 Received: from DM6NAM11FT096.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2a:cafe::80) by DS7PR06CA0008.outlook.office365.com (2603:10b6:8:2a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37 via Frontend Transport; Wed, 22 Mar 2023 10:29:52 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT096.mail.protection.outlook.com (10.13.173.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6222.17 via Frontend Transport; Wed, 22 Mar 2023 10:29:50 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 22 Mar 2023 05:29:49 -0500 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Wed, 22 Mar 2023 05:29:48 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 7c01f873-c89c-11ed-b464-930f4c7d94ae ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d8u0aotvnWd4qIZ/alH+c8fVfDLfzBnoZhIcE/4qKyyw0qWPLyop5h8uH45+CUgGuNuiWHm19jIHrWDAjhKtN3rrU4Fb0TIRhxzHcDz4i0kInxXq3c2a4jqykYmtu++y52N3ZfT2dov7/eppwTssUzWtSAspWm1rAs1lNY+Xhk00KPidVnI3o2pAGDVdwb/K4HGImiW4SvDqathiPLjk3rtE70Tvi4fjvbXfcjODfWE3TXz//MX7wEOl9K5LHOyBDdC0Eme7/gZAqiZJsmt6E5xs+/kPMGuVn76xkFgDr6w14xj2Qy68jOq2HnT4r+hKwfRFEwOdZVfmITzRD/qb9g== 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=oEHhl4OfY4C4g8mhIFlhppd+WY7/WJjjUQxWu0Sbqss=; b=CosUd/HsgZqrWM8gnbV/nZ/FJcEkRUhT0uYypuBoTm8uZbH9YCb0oopGaDZUWFzLGRqfXWjpLnCy59F0d90ha3gUtuPnjmT3wOSXTpfrhc4lxq27et17I8hgCXKYrCpgHMCMrHDlEAAkRZocsgv9pBZUjQBKXu+F+xQVmaJN5YsWa1tCjZzPh7ICB4GCaq7+yKP9iBmH2TQad0SKtAKeMHAqQ51vnAPZQAYOaPnweluzR8xE3Ku01OO3IRn623TwzNl3yqdWoE5wzIMhac8zuJl05L9xGK/GfkH7RiS41rauAFpIZJAkbZUTUKgIoLUCCRHoYXYolGDVRYDOMBb3og== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oEHhl4OfY4C4g8mhIFlhppd+WY7/WJjjUQxWu0Sbqss=; b=1zmwOJqw33eSWQsddehvtIMOEDfRbem5cJxTsop1U+rBefBIS4xVn5KNZIr5XX4qlpPfajRrkNDLHDnqxRxebNEKKnZ6s8Ewh6tOoSBw7urOBBZv/0aw5WqwONOZTM6GjybzogL2jsp7E9GDyrnXTI9IPus4P8jWFY0DYmC6Zos= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Michal Orzel To: CC: Michal Orzel , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk Subject: [PATCH 1/2] xen/arm: domain_build: Check return code of domain_vpl011_init Date: Wed, 22 Mar 2023 11:29:40 +0100 Message-ID: <20230322102941.959-2-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230322102941.959-1-michal.orzel@amd.com> References: <20230322102941.959-1-michal.orzel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT096:EE_|SN7PR12MB6888:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f3128c3-d737-44cd-e293-08db2ac05e0b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VN9ZBhRTFv2vi+5Ju0KmeZCrl/bKKc1lOMC4mLNugc8rTBTZNmVWNNVe2RHKxl+1TbXNPY1M99xRe6ZsfccsNhDh84FNMb155up/X4+e0Ce2tOE2BjQDCcZ9P502pTh6M1tPnsm8jhSnxrlWGhrEzvseDfX4tz1NE7SDrk5f9YPScpwtsMeDvGjyMh/4awo2+4gT6xyTbVj4SyKqhCQFEds0HRYTSRaXLPULNd1uIa5dyt5aJi6mXYnpFVLY4uMWLiYdeG+yYX/Dfpy6bCX8vlEjQijZWeo1X3SIkQfRqnevCsXRpwNO9geDC8lGRikQmzFN7N27NO1x32GgJcFYpcwdqeygLP2v1p41mYdOF7dyFjPZW+QLGyIbwlCgDz+8iNXiuue5ra8x7Y5Vri4kYs3UJ671M0L50niQpvSzFJxk/El2trivpow7GW7NPqVQsqI5KY123awRp+sMvZAq7iIDIFX5okp6d/LzQH+7hkQ+3JgJMsYL+I4ebdsjE3p4pqxvjnPk4nMlDjjVb3v5d9aFxJ+MS9CRoGoOL76JNdmQGGR04LHtl2gwo3Bg4rvZffTuikLDzS/z5n459tBg3NH2DmTCyyIwXqZYEvfGjVtFoIbXkaxEOi85PCod2CsezhKoX30/hJxNdC6sy/6jJPtQJ6cA2gNd7DPJ3AaGHAgPz53r/tohqs2o9TaP3rn80fbPZSMKbTupF3z66Hr2D2KW2RW7EC/KFpONVhStwUg= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(376002)(396003)(136003)(346002)(451199018)(46966006)(40470700004)(36840700001)(426003)(40480700001)(47076005)(8676002)(4744005)(54906003)(44832011)(316002)(36756003)(36860700001)(70586007)(8936002)(4326008)(6916009)(41300700001)(5660300002)(70206006)(2906002)(40460700003)(478600001)(83380400001)(82310400005)(86362001)(81166007)(82740400003)(6666004)(356005)(2616005)(26005)(1076003)(186003)(336012)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 10:29:50.2200 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f3128c3-d737-44cd-e293-08db2ac05e0b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT096.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6888 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1679481019107100001 Content-Type: text/plain; charset="utf-8" We are assigning return code of domain_vpl011_init() to a variable without checking it for an error. Fix it. Fixes: 3580c8b2dfc3 ("xen/arm: if direct-map domain use native UART address= and IRQ number for vPL011") Signed-off-by: Michal Orzel Acked-by: Julien Grall Reviewed-by: Luca Fancellu --- xen/arch/arm/domain_build.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9707eb7b1bb1..3195c5b6d6ac 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -3826,7 +3826,11 @@ static int __init construct_domU(struct domain *d, * shall be done first. */ if ( kinfo.vpl011 ) + { rc =3D domain_vpl011_init(d, NULL); + if ( rc < 0 ) + return rc; + } =20 rc =3D prepare_dtb_domU(d, &kinfo); if ( rc < 0 ) --=20 2.25.1 From nobody Wed May 8 05:52:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1679481019; cv=pass; d=zohomail.com; s=zohoarc; b=Eu0Q/iZg94aYV7zKg0SI5xPxGUkgHNxf3WDeL+yPVvvWH5KdpF9E/z1h8kTKjmrS/2IZfyTxRd2PBLY+ihdW6COJLbB/JozO14wkU/HMQObHFknwr3eh4PibZjNyeu5sPFK/24Hv7t1sJumG1Ps5PkA59N3el5sFZYbg08vyDlM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679481019; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TyJRc0znxvGeUPenKllUBZbO/z1IN4gNAyJvbD+AGP0=; b=ZY2mADtcq5r1phm5MW/6XJQNmTJ1K9ZKoiZbEjI5H3J4O0sWDL8CTG8SYBbkXXzOq3J/tQdLJRvnUmN5Hw5LJw0rg38hGGHDaS3lzrRgs8pArJk+3NfXKQnH4RIZz0FflebF7nP2T/T6QYkqzzuwO+xxcuPM0f1Lm2dcRhW/WcU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1679481019275186.94892267306386; Wed, 22 Mar 2023 03:30:19 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.513302.794145 (Exim 4.92) (envelope-from ) id 1pevjF-0000Lu-Ov; Wed, 22 Mar 2023 10:30:01 +0000 Received: by outflank-mailman (output) from mailman id 513302.794145; Wed, 22 Mar 2023 10:30:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pevjF-0000Ky-IT; Wed, 22 Mar 2023 10:30:01 +0000 Received: by outflank-mailman (input) for mailman id 513302; Wed, 22 Mar 2023 10:30:00 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pevjE-0008I3-3M for xen-devel@lists.xenproject.org; Wed, 22 Mar 2023 10:30:00 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20603.outbound.protection.outlook.com [2a01:111:f400:fe59::603]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 7e84b6f3-c89c-11ed-b464-930f4c7d94ae; Wed, 22 Mar 2023 11:29:58 +0100 (CET) Received: from DS7PR06CA0023.namprd06.prod.outlook.com (2603:10b6:8:2a::14) by CY5PR12MB6249.namprd12.prod.outlook.com (2603:10b6:930:23::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Wed, 22 Mar 2023 10:29:53 +0000 Received: from DM6NAM11FT096.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2a:cafe::7d) by DS7PR06CA0023.outlook.office365.com (2603:10b6:8:2a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37 via Frontend Transport; Wed, 22 Mar 2023 10:29:53 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT096.mail.protection.outlook.com (10.13.173.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6222.17 via Frontend Transport; Wed, 22 Mar 2023 10:29:52 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 22 Mar 2023 05:29:51 -0500 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Wed, 22 Mar 2023 05:29:50 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 7e84b6f3-c89c-11ed-b464-930f4c7d94ae ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F4C2nVVuNH5Zzivo4wSKC817rApHB3DguqcQW5p81X3E8RDaEmWLeXbM9srrdH/voGYeI2hqRQz5s8nauhO+1b60cqylwpofDGCTMySmRzcMCNeRgsJuhWkZmCjc0sAfQR7g1PC6jU7C37K1GGt4yEZlGizu+qzMUMhlHbbBtGKNoEofj3arJpV+yX9xjgnwBSmWpDo7aAkYn0gAfiM/ZA+G3Kf3Ao4oJ9hQcj/etHWSbWylWD2zVxL/An0Ple3raK4rRz73o72y0BF9WaJDhwOQpIoABycQm9gQ+JpRMfxqBgydUz03LmsPJ+t0d7CBUSZHy3Q0vccKe+HuPGsekg== 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=TyJRc0znxvGeUPenKllUBZbO/z1IN4gNAyJvbD+AGP0=; b=dYRgWtgS0/Zm2wFTbJhECusIlzznLCJ1GsuJKbYRCPOq8Xlx8Lo8msseFxXPdyOXMv4A4WdwpGoSTe2YA2q7wjmLIpFEHkRdsP7uQ5Qu9ICXR5afuEKDKkPIeIOdzETAs7Cc1YrN+MbNqNMHAcoJRmsqEcVwgHR7DczXCTl+m2MnMgxuECDcWRyqznCYTuhyC/bPqqz5FG2MzhimY4IF9KhYoGVMat02EB1er7wFArzjcqnGjNGHAkzNNl3vaReW5QDMa2tSHm2FVJAG2/qpKxlnN5nKYRk7jAznxTsTNB4YkcgOMIcpsAumYmTEKN7xIvisipPItIfZC4IUpATb9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TyJRc0znxvGeUPenKllUBZbO/z1IN4gNAyJvbD+AGP0=; b=Q/8qF0Ix/cGaRvoa3Ck0JgSQOOlXG/W0El0BHYmyl/AyV03NYnM9GMDOTC80pB+tuLgzjNyOw1MRoOOUdg0T88096q3ayhiK2AjKqsDMGM+8YkUv2TstBtR1zDiiq7lnjzOBt3rb/WTnHwQSp5mXudfDypSGYeJSPMz9CfEkqaY= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Michal Orzel To: CC: Michal Orzel , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk Subject: [PATCH 2/2] xen/arm: vpl011: Fix domain_vpl011_init error path Date: Wed, 22 Mar 2023 11:29:41 +0100 Message-ID: <20230322102941.959-3-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230322102941.959-1-michal.orzel@amd.com> References: <20230322102941.959-1-michal.orzel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT096:EE_|CY5PR12MB6249:EE_ X-MS-Office365-Filtering-Correlation-Id: 76db225f-5eb6-4117-dc18-08db2ac05fb1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZWZs8Gdm2pyz9qJD4AnSgsscFj96KcJWDmKFn7lZnaBzRbDP5O+acVXM/oiL5DBQU4o7KfeG2KXoNcWwNVeo4mWHE2WRSgAx7XKZZzck9RtsNiBVJaNOJDaVzTjW7ZZC2PQXOpAyj8ROjPU5ehPFJGeT06p3dMGFTv+PhVNJpHERJs9FAWxsOvsuyBj+BBduAefy1ixVi0iM7LHfsMVZeRDTULLX8XRAqoVxbG5gg/cISI6HepDh65a+dUMb1jeUDd653jHqI+n9m5YTeZletRVFPArMWqqutreDhNSHswbovoawCcxPB/jSf7yonVdDDxfqdNQos4DjGDLdk0kybTY3b0ZJHIk917pi41m4XFOLV3SSCPV9Sjtks+mmW1ijtmerFyhGPZB30VRMQIQFf31/YWySX2oBgjW5PxZ/SrFjD2LXm3J9z0+itOJR76TeKx/pyUOOhgR0Bpe/saFJDuyuuBxNqEuild8YdqePQbT3gwnfITF2UpcDkYpJJNlvCIiB0kMkyA/CnNHBul0SHXAj4YbH3Xz0VBFJMx0wPRww9ITidymGS8mnzPWjcChjod+z61zHy1Zd0INCKWhoNqM1sdjeQZsCWbpqGJk/9c1yq3lxy9fCHgQRgq0ULsbF+vYwFhbGcu6GFVGZamntEdvtwPph28MwsA+seEtWndaeb6e1yyMPGsPdSxNg2VfW6+tw3Z2+cHZMyPbC/n1ITqyehM0f3bkvvJByhRqTsc4= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(396003)(376002)(136003)(346002)(39860400002)(451199018)(36840700001)(40470700004)(46966006)(186003)(1076003)(26005)(82740400003)(426003)(47076005)(2616005)(316002)(478600001)(83380400001)(54906003)(336012)(6666004)(8676002)(70206006)(70586007)(41300700001)(4326008)(36860700001)(36756003)(44832011)(5660300002)(6916009)(40460700003)(2906002)(81166007)(8936002)(356005)(86362001)(82310400005)(40480700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 10:29:52.9855 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 76db225f-5eb6-4117-dc18-08db2ac05fb1 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT096.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6249 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1679481021169100004 Content-Type: text/plain; charset="utf-8" When vgic_reserve_virq() fails and backend is in domain, we should also free the allocated event channel. When backend is in Xen and call to xzalloc() returns NULL, there is no need to call xfree(). This should be done instead on an error path from vgic_reserve_virq(). Also, take the opportunity to return -ENOMEM instead of -EINVAL when memory allocation fails. Fixes: 1ee1e4b0d1ff ("xen/arm: Allow vpl011 to be used by DomU") Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu --- xen/arch/arm/vpl011.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/vpl011.c b/xen/arch/arm/vpl011.c index 541ec962f189..df29a65ad365 100644 --- a/xen/arch/arm/vpl011.c +++ b/xen/arch/arm/vpl011.c @@ -696,8 +696,8 @@ int domain_vpl011_init(struct domain *d, struct vpl011_= init_info *info) vpl011->backend.xen =3D xzalloc(struct vpl011_xen_backend); if ( vpl011->backend.xen =3D=3D NULL ) { - rc =3D -EINVAL; - goto out1; + rc =3D -ENOMEM; + goto out; } } =20 @@ -720,12 +720,15 @@ int domain_vpl011_init(struct domain *d, struct vpl01= 1_init_info *info) out2: vgic_free_virq(d, vpl011->virq); =20 + if ( vpl011->backend_in_domain ) + free_xen_event_channel(d, vpl011->evtchn); + else + xfree(vpl011->backend.xen); + out1: if ( vpl011->backend_in_domain ) destroy_ring_for_helper(&vpl011->backend.dom.ring_buf, vpl011->backend.dom.ring_page); - else - xfree(vpl011->backend.xen); =20 out: return rc; --=20 2.25.1