From patchwork Tue Sep 7 12:04:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12478437 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 416CAC433EF for ; Tue, 7 Sep 2021 12:04:42 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D7EE06008E for ; Tue, 7 Sep 2021 12:04:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D7EE06008E Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.180902.327766 (Exim 4.92) (envelope-from ) id 1mNZq4-0003rM-PV; Tue, 07 Sep 2021 12:04:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180902.327766; Tue, 07 Sep 2021 12:04:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZq4-0003rF-MV; Tue, 07 Sep 2021 12:04:32 +0000 Received: by outflank-mailman (input) for mailman id 180902; Tue, 07 Sep 2021 12:04:31 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZq3-0003r7-AZ for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:04:31 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.109.102]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c166c816-0fd3-11ec-b0eb-12813bfff9fa; Tue, 07 Sep 2021 12:04:30 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2055.outbound.protection.outlook.com [104.47.8.55]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-15-1WTDrmR2MLyfRnbNaWU5jw-1; Tue, 07 Sep 2021 14:04:28 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB3120.eurprd04.prod.outlook.com (2603:10a6:802:e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.25; Tue, 7 Sep 2021 12:04:27 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b%7]) with mapi id 15.20.4500.014; Tue, 7 Sep 2021 12:04:27 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM0PR04CA0096.eurprd04.prod.outlook.com (2603:10a6:208:be::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Tue, 7 Sep 2021 12:04:26 +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: c166c816-0fd3-11ec-b0eb-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YUjiZ+FcARWZPfFdze9B3FWeG4LoDQIbpj7UKsZHujs=; b=Qg/AlsS5lskTedWM7PBZtc1T9M3UnlHNgaXHI5xEZiSzMq4mgEMA/4Tfkd06ub5k7A1nym EzneuDDEenGhF9w9DpmDJBZcWb8yfhEUN98MKruMkhMVJIy3IRs/85Zohq4lhwj2fpqFCn qq0gYMMRPR/L0MyPW66A9eFqRyNkYRI= X-MC-Unique: 1WTDrmR2MLyfRnbNaWU5jw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hWqVnRoSMtkkKoLxFIHeXIgiaJovVpi2T/C6/AsZB7qDEw+xtIrewTpygFBpQZZoseK8rv/oXPeqB/Kza9pJ90bRay4WbZJj7ouIFUIA8vcb/6Q9ZGxjOThcrIIGWqZGjuqEo7RoLMYwhGcZbyvUu28tXdCKByKfWxZMD8a0CTqjWYKz1pu1b4r42ZD4nZOJy9EdJv+9mAK18zwcpqqbMkYXrwHVoY90wnTudnjsEwyz7cCtferfkASLjI4MFjnMq6vxo7WfJr4FgGcQ+vZyfr0D1iJZv01FvTd2ko959+vhmP6sUAuO3C8hIc/CZB81u+pTlRYutm4XWuZzGmkDJw== 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; bh=YUjiZ+FcARWZPfFdze9B3FWeG4LoDQIbpj7UKsZHujs=; b=P/sUORgtT+v0e8U6tOn4IUxrHCYqaVhHrluOs2tQ+UpS42gjQBgVMNtpDnx9DGQHxpUC0onhjzDLvMQMEXKU4ytjm6SUeW8tcXIEF0azjIWi4sDVwQU67lYxbLsF+m0DrXo5T+8fltnBWNvJzwcnOwroomHg9EGY81/Ygjgb9tWq7BJiXssn3FFbywMjF9Jl7u+BBnrECVbegyPrEUE9vtXVBZzJqDvQmik+bI5pP4wcbvWeNdWKLYnyim7nJTGIbZq+I8lJI1vQ1pz27lm+AnxS6LJ5TO3IRV/dqLadTHtTLOjFwN/Ktxs0sBXMmLdH2IKAUmXxYSYzAmv1NyBeNA== 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 Authentication-Results: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 01/12] swiotlb-xen: avoid double free From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , lkml , "xen-devel@lists.xenproject.org" References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: Date: Tue, 7 Sep 2021 14:04:25 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: AM0PR04CA0096.eurprd04.prod.outlook.com (2603:10a6:208:be::37) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 921de9e7-79f6-4e70-1d37-08d971f7a410 X-MS-TrafficTypeDiagnostic: VI1PR04MB3120: X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cTKXp63JMT+BOej5u6mmIeFwoZz5HLopoCNNDmsPAfAJMiZxsA7fw2XDuaefcIvO/z9fhrHpmzco/sPf+qbyEWQg2kNkrv2VEjOuVlrroyMfcvfE2I072EhTZ1sYwOAc1jeqdzuboiL5weYhMRsPIXWe+DIR2ju2+eV2gX4NzVHEYcxK8AkcxTiQh3EWAWkNO8R8vcTAQL/f2fMwEKP4lGofC0XzX/eIOLDHvw/pRPFI2ActBVdpN3zwUA82e26DNpRS8NrPCkA7DK00nB9WbruRgOrp51QMku8GZG1lx0MhjqfqrJKVaQ3b+rTLsh5EoKVGfmNYXAVg2gHNsrHNi0qshYakSNwtE8mIYZxNvmtXSIqEIFYN+/gP9sHzd5Ww0lctLsRQaCuKlXMqNpPC663xQC9eXQstM2YVJ+W4J/Z6n3UbLvecHEpc0gBz/2gOKgBt97MEmkrGnDeIXhlKq6QIKAwxWBJmE0apSNBNLGqGHbfkdTSfJHN9vBPz3LHEg4NhZ5vwOF1+SoOybfIeL4a9wXdbtQUJP7s0WxoU7yHZlpmA/KAvYbnxx4rOJDOh8QTU+NxyXwnN0xWQemY7TAslj8ZaxC+dVtzeDeRk8wBSeKHml5NqiBusXJpiUX5VjwvtW9/D2f01BHWq9iRGvuBywI4/e3nz4tikmbBjWksPB+xjrhKgnvo6msIQwlogf8IsKWSeMjRmMhRHvCFrj/JYibGZmYHfIFLdDz5BGHI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(136003)(396003)(376002)(366004)(346002)(6486002)(956004)(38100700002)(2616005)(86362001)(316002)(16576012)(83380400001)(26005)(186003)(36756003)(4326008)(2906002)(66946007)(66476007)(478600001)(66556008)(5660300002)(8676002)(31686004)(110136005)(54906003)(8936002)(4744005)(31696002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?wqnt9sMW9EFYyha1brPLzFnHip3Y?= =?utf-8?q?Ft2h+1G+b2M+ULaBRSzZ8k1Oied3M1PZjGT0KMO0s6bs12J6VfRnhyvaKNaXHdVqY?= =?utf-8?q?tcG+Z7rkHGzHG4EAWcS76wEdukHBZKl1V8MVLCP2tbojTGzPsZu1JFgiYFIJF9bEg?= =?utf-8?q?DbFBdhnBjXuW7K+/CnwhoOwYG47S1r1TgNer1YA6I9nV4OMXhbt1rsmQf3SCy9hjL?= =?utf-8?q?MZVse1cg/XaOyI//xMoco5gcSgiYiwVBmrkWy7j22L4b9VaCa4C2F/wjU8mXMTWjX?= =?utf-8?q?U4PRjjDflvLLkPCH4ze05EmMZ0O5iZ31/R3btJczJLRgP0Vd9VVFp+I9K4MLHWJYy?= =?utf-8?q?1zGHqiZ4IBrNbKHnv8ipj2/aPKxeTfaAa/Zr8/yU8naEMvUVAxsMFhhVidf5bIEri?= =?utf-8?q?L58/+lkBLd3drqoxt41Sw9Ql+z+SybXg7ZE4OudrYLfgKSjbDoUhtRLuXH63Vxp/E?= =?utf-8?q?OG2qRb41et2EubWcEjUlPo1zI6G4wogU450uuVbOMlXzAysXnqidOjMzYNI996kW8?= =?utf-8?q?BcBe3lETn33nqF5gJw2Ir3b0mtezMHqXT0yRCWHk0K1Zcv/rON4HSuHnWhe4EOvgm?= =?utf-8?q?mOrFjeG1m0slmyug4qLvOHwYd0t1kyEF31LLMp3smB6yfAn3coYhW7d5T1MWz0eJz?= =?utf-8?q?Gpq9RgPeYcrDNtrkwxXfW74M+B4TzDCPKYabDNJNJXW52eut2Phcc5TySio+ElAlv?= =?utf-8?q?fK8dLyhDYRKNSA/21lVcrxcqZgV7YVcmbZ8plvyRhTLMKHxWzOX5ZUC9tjYDhXdYs?= =?utf-8?q?kmkhc9kCL0KhnKimlQgN6toZGRwTv5TajXF1OO3vdE2hSUbAg79AzsN0gPpCa3ah0?= =?utf-8?q?D/GeV7rhe8uwaRbbvdqF9TxaWk+0Ut/mwMvgqNv+6Iy5gr6GAKjmaOtSzNuDU4oAG?= =?utf-8?q?ABhu0Z4ZjPtGNbc5tN13/NMnEmV0MN2FYojBoGPxooKkgrkakIBBr72fZUfpumUZW?= =?utf-8?q?446mk/t+KAqlZz0JVCjNZP5ChdxshMVnC2cBSIdfL1N5QDDu6MjTeFrrqMHtUGdYt?= =?utf-8?q?34twfQxGSLdZ/LiiBct9aA97nA62I01AvfoC1tvxVlTSFTsy+wOu7ZBJ7X1sN49gB?= =?utf-8?q?N0FmsnJBtsgpNeGcNZuZFc3QPJzhHXjPe2VDlaXNo4P05wy6lEwlLq4GnyIkUuTJm?= =?utf-8?q?5Mb41keay22mzS3v7USg9clD698CVUO2rLjUPkcA4eEPQsCK7ByNl5QpWRkn2G5a6?= =?utf-8?q?NWMGmhVo2WDxHwnm4jgtQTKnGqNzRAnyGFHy0WENjVWAG8SzkZU1bnjyZ9mtOD9I9?= =?utf-8?q?rNAZYcDqmM+yfsrP?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 921de9e7-79f6-4e70-1d37-08d971f7a410 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:04:27.4045 (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: fxmyLLc2/qK2sEN83kbQC4/qg3WM3+6UGQu1CSP/kkah2+uudkIas1308gmuLjq4QwRWerOTYZ0iL0+NKi/ObQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3120 Of the two paths leading to the "error" label in xen_swiotlb_init() one didn't allocate anything, while the other did already free what was allocated. Fixes: b82776005369 ("xen/swiotlb: Use the swiotlb_late_init_with_tbl to init Xen-SWIOTLB late when PV PCI is used") Signed-off-by: Jan Beulich Cc: stable@vger.kernel.org Reviewed-by: Christoph Hellwig Reviewed-by: Stefano Stabellini --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -216,7 +216,6 @@ error: goto retry; } pr_err("%s (rc:%d)\n", xen_swiotlb_error(m_ret), rc); - free_pages((unsigned long)start, order); return rc; }