From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8AD4542D46 for ; Sun, 25 Jun 2023 08:36:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86BB842BFE; Sun, 25 Jun 2023 08:36:55 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2058.outbound.protection.outlook.com [40.107.237.58]) by mails.dpdk.org (Postfix) with ESMTP id BACF140A7F for ; Sun, 25 Jun 2023 08:36:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=niVbRN5PQH4Mp3lINQOjyxMwV3hLt3h2w2zQtsdkdXQr6kAWLLVMdA2SKHIOtq7HphGuBXh2lY4pNPLazJtv8MEhqL3t+IrWL+VpSvAUFEAHqiZ9uih3IpVacs4nWMdpvV1ly6RGmgmSU1ATnvg5XlGdiRztLQxGjksdqwmgAUlHio8HUTcI8CDO3ueXMpCeQ4K0y/P9q1dZxEvtV6gRO93Rc8rc4NOfP+AkEyXCXdvM3dQOwWaOQ1L2CPPceYoLxVHZTLZqlMA5Ccu4DwnrF8IvaM96KYwSu12YqeCRsRWLHBcFQONSYo4C+qZB0ShC4h2ny0Ktoua11GLxJpHA0w== 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=yBbbolmVyRnRHK91qaXMISeHrbQHCjgWFJ5JZO3R5HI=; b=AfbB+XRszq1RnFyakex6BuPp4XW3ZAtCEOMp5Fp1ocu3V99awTvDI275XNlrFfyyPDMmUEM7nQryVK+F4Td+rye1qX3BmwxwD8LNIoyw1XrHwHXCSVeWFYD453zTA5mHwwR/32/cUx2QWYAN+eLUMgTTi//+FceLiW3r3HSLfQfpQaHW9Gbjf/+JjlQNlMkX6bLASuWvyi76X6JEUwyu6fmJxvwWiwkDgfLWK6DsaW6iJBL70jBPkKO1mwwVR/UdKgN3ZggDR74lBbcCfRzPqe4Ktgi64wjzye8Ucz9YEERZF9w2uBRyxnhHsB5WjEKI8hnADO819Ylw4pXlHTbvig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yBbbolmVyRnRHK91qaXMISeHrbQHCjgWFJ5JZO3R5HI=; b=ljJPF7YFE9HTacc3q3baGje8uCdaExrkgoFTDFi3Y1u71DB7MzqIoI+OomK/Ifuk5YGllnamfG/YA443hkwptEnWkGEG1NuQyYH1qoCIvKSFnsyxby5QeIlPLo/02/fPBQvaAQXQBgiMnUdG6Go55wQg7Z/DJMQmjkXTHhgH3kXKaMkh8fMxXvG2PpE5UCYnPHwxv2nr+eP5iEjZTvcjcDoGouSerSh4DjNsjY5EghxFvLWKXP/iNv4V7+IZBBrV8Xe9W5Sj9DzzBwdnyfU/6hRnq6tfdjuFzp3e5VnbpfkbM3NJLBcmNytoYRQ0tYMAQT8V9WVb8cksUvBwqIIyHA== Received: from BN0PR07CA0025.namprd07.prod.outlook.com (2603:10b6:408:141::28) by CH2PR12MB4874.namprd12.prod.outlook.com (2603:10b6:610:64::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Sun, 25 Jun 2023 06:36:50 +0000 Received: from BN8NAM11FT007.eop-nam11.prod.protection.outlook.com (2603:10b6:408:141:cafe::86) by BN0PR07CA0025.outlook.office365.com (2603:10b6:408:141::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:36:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT007.mail.protection.outlook.com (10.13.177.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:36:49 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:36:34 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sat, 24 Jun 2023 23:36:32 -0700 From: Xueming Li To: Yunjian Wang CC: Konstantin Ananyev , Honnappa Nagarahalli , dpdk stable Subject: patch 'ring: fix use after free' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:33:43 +0800 Message-ID: <20230625063544.11183-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT007:EE_|CH2PR12MB4874:EE_ X-MS-Office365-Filtering-Correlation-Id: ced3e2f3-0e83-4bab-a501-08db75468e48 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pe3O6XiXFBi5IHS6OOvwYyTfMNUwI1cq93zZQK9jKp1Is8RTcK3kslekEKf+0Spju0X2ZAPj51ZLl1v463B48TeeL0T3P0rDE4RDeEgYyCJJhnj0a7ssFhihLpN1t6JrjfgKI1Wbec+pRTfuir2ti3lT3Zy/a2aMzT4EqlJBsDu7QAPPhI+DYsnaBCxHEXycA4ekJQKtijZzG7YXLuHvyLuB6iBFXXnFvTT1yS6N5Z3ntR+/qZbNn184t9fBc0YC20p4wNCWb6tX8EkiAWqY8Q3zM/CNY+tKwOSeB+x1DmVGe3CschT46SbmLkgca7eC9+M6wogfHzF/0Ts1nTfXREPp8HnmhimfwiiXMh6APGgwOe9BDjR1hOM11AO3RUUEjXBAK1hddibe6c+fUuNqTOlGB22r4t2j++jgyUYSdSkWtuJASvYhulUJgIf+hAcYWzr2mJ283GJa3V9ztyJjF6MgoJeMbQareI0a/8gOdsoR62yE+wVLHWNoe/Dfp7d4aXHMOOBwORBQ8Y1DOPPFp6gdGyNZgiKc+jEEF+dzu2Vg1LWRySUyJ3S7vyU5BBcC3hY5LqHPm2gyBvLV/TTO/I/kUjLmycZM3o1C8yjm0aMSRecJ+2ZM3XsjDshPzrfa5zcfjOPBL2nlNDAGJ7AM8KAXVAmI6MTYNSz+l9RD7KGPSDPU3+AIBYgMbw2HBYSYVmIJvy0Trlv5i+2ILUyN5gHygpXy+Ryi9BDv42Jgr5suqO66KMXzpP7HYxTNAt+Cj45lQLSiTK1iJSNMAmTjKc/+nYT8PQzhYICvD2fkS3ssnACGOWstuoclo2vQ94iY X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(396003)(346002)(136003)(376002)(39860400002)(451199021)(46966006)(40470700004)(36840700001)(2906002)(40460700003)(7696005)(82310400005)(82740400003)(6666004)(7636003)(356005)(2616005)(83380400001)(336012)(426003)(1076003)(26005)(6286002)(16526019)(53546011)(186003)(47076005)(966005)(36860700001)(55016003)(41300700001)(40480700001)(86362001)(54906003)(478600001)(316002)(70586007)(70206006)(6916009)(4326008)(36756003)(8936002)(8676002)(5660300002)(23180200003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:36:49.6468 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ced3e2f3-0e83-4bab-a501-08db75468e48 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT007.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4874 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=87427323441159c538e9f04724ae6eb55edb3804 Thanks. Xueming Li --- >From 87427323441159c538e9f04724ae6eb55edb3804 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Fri, 5 May 2023 14:48:34 +0800 Subject: [PATCH] ring: fix use after free Cc: Xueming Li [ upstream commit ce4bd6e14aa693c80c5218f7d896c98b3b85b54a ] After the memzone is freed, it is not removed from the 'rte_ring_tailq'. If rte_ring_lookup is called at this time, it will cause a use-after-free problem. This change prevents that from happening. Fixes: 4e32101f9b01 ("ring: support freeing") Signed-off-by: Yunjian Wang Acked-by: Konstantin Ananyev Reviewed-by: Honnappa Nagarahalli --- lib/ring/rte_ring.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c index cddaf6b287..d068ca4d37 100644 --- a/lib/ring/rte_ring.c +++ b/lib/ring/rte_ring.c @@ -332,11 +332,6 @@ rte_ring_free(struct rte_ring *r) return; } - if (rte_memzone_free(r->memzone) != 0) { - RTE_LOG(ERR, RING, "Cannot free memory\n"); - return; - } - ring_list = RTE_TAILQ_CAST(rte_ring_tailq.head, rte_ring_list); rte_mcfg_tailq_write_lock(); @@ -355,6 +350,9 @@ rte_ring_free(struct rte_ring *r) rte_mcfg_tailq_write_unlock(); + if (rte_memzone_free(r->memzone) != 0) + RTE_LOG(ERR, RING, "Cannot free memory\n"); + rte_free(te); } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:31:58.727222000 +0800 +++ 0005-ring-fix-use-after-free.patch 2023-06-25 14:31:58.285773900 +0800 @@ -1 +1 @@ -From ce4bd6e14aa693c80c5218f7d896c98b3b85b54a Mon Sep 17 00:00:00 2001 +From 87427323441159c538e9f04724ae6eb55edb3804 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ce4bd6e14aa693c80c5218f7d896c98b3b85b54a ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 8ed455043d..057d25ff6f 100644 +index cddaf6b287..d068ca4d37 100644 @@ -24 +26 @@ -@@ -333,11 +333,6 @@ rte_ring_free(struct rte_ring *r) +@@ -332,11 +332,6 @@ rte_ring_free(struct rte_ring *r) @@ -36 +38 @@ -@@ -356,6 +351,9 @@ rte_ring_free(struct rte_ring *r) +@@ -355,6 +350,9 @@ rte_ring_free(struct rte_ring *r)