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 9FEA7A0C3F for ; Sat, 12 Jun 2021 01:08:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 92BA44003F; Sat, 12 Jun 2021 01:08:28 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2077.outbound.protection.outlook.com [40.107.223.77]) by mails.dpdk.org (Postfix) with ESMTP id 8E76D40DDB for ; Sat, 12 Jun 2021 01:08:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eZVVxzpE6g0SwkkthTMEDqZ6JT7wQdBL5eiZoxAZjhj8UYUY5Qzdx3JdmxTBX1U0frGLhr/7XADv4Fg9Xj0cke/lqP6L3PXKiGFCsUMklcYPNinqw4AAZCr4MTpvc1IxGVidjOfYF3eRXTJDERcoK1So7zFWor5F4SBoRLzV57eJ4TY2yA2c/3QSAhv8UIP7gbB9gBuI48mMjUFOY3vWPxM8tsFnjJJpNGMnUDuNL/CgRRW9taQN3KY0jDOHcLyQRUeMfTcJBbf4fe2FMrDRovcR2ZDTNwnWVUg4diyzH+4XUT5Jof41NYXDlzp1z8znpaKy/m+eYlmHiInXC0fvyg== 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-SenderADCheck; bh=ENQyascN0fRSn747JkfPO5wDpEoocjipNRvISwmODEA=; b=CRqbTDSB4Tzl8En701zsS0BFlE1TQmEaZy1JkMuN/4aECGKV9VcR9Jm6w/0i2DZBJIV/ezG/68s4Iypq0GbtG/Gqc5oBhXeF+iKC6R3iFVFN8gyJVg+QlUvkJSd9aOpQ6PTlxoAsxgt0We4d6W9iDXSKiJ/DJso99igmnbdSLBtCD7WQu6Y1vr1GEL4rCRnKpsl7Iw6rwdqY8nV1/8recCPqy2y3mn/AjfS4+KLi/8YG9ilTT/WUk4MoAyl1Z95dZFZikgD3dJnCxC4jWjr1SxZUFPRYhvYozR54MhT06VTd7P0eJdIrp/A8lJDIgxdx1Yqorfs+pF0wcdjO+Ql79Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=ENQyascN0fRSn747JkfPO5wDpEoocjipNRvISwmODEA=; b=AqIRgAIvUGdAGrNQKmqhXDMcoZrfQj/qFruNKvS3XyMgpS/bZuI4MxE7E94ir+lvzdKLU4GNuRztBHyQDdb4vPzK6YY/7RJXNXz1vPHcvij4QPNGFhCJjvbFx98Adeg6XNVzfzJBfzhezdn+oGsmDdX8W37Bk4bMjZGyGUekf7EnhF9374CRvHMJaTO09EjuhCQIFkfg8KaoFjHnWZjsMlZMOUG1/6x5AKgmhRtIuZd0psKDZkb3NyjfabysU8iR2rrjqvFAM1ancwONQ+up/mtFfMd2FKECo1OkVnbNd5/DiWplA9NpJt8rW0YCfFXyE3rL1+QbeDVliFnqeBzpxg== Received: from MWHPR1701CA0003.namprd17.prod.outlook.com (2603:10b6:301:14::13) by BY5PR12MB3873.namprd12.prod.outlook.com (2603:10b6:a03:1a3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Fri, 11 Jun 2021 23:08:26 +0000 Received: from CO1NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:301:14:cafe::a4) by MWHPR1701CA0003.outlook.office365.com (2603:10b6:301:14::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:08:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT025.mail.protection.outlook.com (10.13.175.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:08:25 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:08:23 +0000 From: Xueming Li To: Chengwen Feng CC: Luca Boccassi , Min Hu , Chenbo Xia , dpdk stable Date: Sat, 12 Jun 2021 07:02:12 +0800 Message-ID: <20210611230433.8208-38-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0a38bc3a-7ff5-414f-66c1-08d92d2dd151 X-MS-TrafficTypeDiagnostic: BY5PR12MB3873: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cgpyHAPkRgtDSQFB4HtfbWLAJjJPcWjoidKau2XRAq2ATFufMJCJIM5LFn90PRc1vZPFCrgZzjEQw7lxurh62mjNRmIyQ8eSLwlkrmDaYzhaEbDvL4gz/l+1yMjMTAt+Osu6M73LjglZlY8m0Wx5CfToTiviMajF91TwtExawN1JMtYRglzG3wIB4mx3Cj8FwnGjJ4F41S+FMub7P44lA9OpkHH4ul6EGNfz6mPM4qiHnaSSxKarP6BMZuFk1cMLSbmzRAP/c4ouAKalkqxoRmS/eSRGJkrDwuKtdpluf5AXBRYLgfRpmA9zmVVEtuFYmFwAWICLQMy/wOSs1yRo3lygiNQiJWPovazoDVRhi+E1TFvW9cpPjzS2qhyH8VX7SH1mRc0EET/oVeI6QCyBSbgBUFPtQSln4upRxbh3Px+WWbZbFyfuO+6fX36DEO5/ARgKYCQsBAwMNiW0bEYK928h+b70ZruG7f2US0CjLMMnlPwqoeSqybIzpPU6Ayxn7kNv6+IpIbSPwGTpYHixY2McpNoQmNrAMqxXNjVmGkruXm0BAk0pEj9GhudtPHbKxEvNupS9TGdl7Nc+RAnoUqC2mqVmtbY6uQau1RkoS6pvhqtJzcRxlxdoMgHnw0HylEUArnPaZKGPY60m5wfdDABLgMnCjIt7uaL9fFXR+jCN7281oT0ccvQ8cj6JaoCZUGlcZRpfMeqmU/LvCFANSAeJpJDkD66g1wsBMyfWeFJKDlF42PJ1U5N3lAXWsolBbrdDedWzbeEwdacfRFtQuuc2A8/eZ6Ms8nF42Au1q0BV4jqWYd/4pRG9VsMcH8an X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(136003)(396003)(376002)(39860400002)(36840700001)(46966006)(7696005)(55016002)(53546011)(8676002)(70206006)(356005)(86362001)(82310400003)(8936002)(478600001)(7636003)(6286002)(26005)(36860700001)(186003)(966005)(6666004)(36756003)(82740400003)(70586007)(36906005)(2616005)(16526019)(426003)(47076005)(336012)(4326008)(5660300002)(1076003)(2906002)(83380400001)(54906003)(6916009)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:08:25.7077 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0a38bc3a-7ff5-414f-66c1-08d92d2dd151 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3873 Subject: [dpdk-stable] patch 'net/virtio: fix getline memory leakage' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 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/14/21. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/0f0469489b1a11ac46975e2b53f5ff8d42692446 Thanks. Xueming Li --- >From 0f0469489b1a11ac46975e2b53f5ff8d42692446 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 21 Apr 2021 09:37:49 +0800 Subject: [PATCH] net/virtio: fix getline memory leakage Cc: Luca Boccassi [ upstream commit 9f528374bffb5868ec6bf896f57919a709b31911 ] This patch fixes getline memory leakage when parsing dynamic major num. Fixes: 7d62bf6f54ba ("net/virtio: introduce vhost-vDPA backend type") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) Reviewed-by: Chenbo Xia --- drivers/net/virtio/virtio_user_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index 45edd2ae60..0906a34799 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -584,7 +584,7 @@ vdpa_dynamic_major_num(void) { FILE *fp; char *line = NULL; - size_t size; + size_t size = 0; char name[11]; bool found = false; uint32_t num; @@ -604,6 +604,7 @@ vdpa_dynamic_major_num(void) break; } } + free(line); fclose(fp); return found ? num : UNNAMED_MAJOR; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:57.654376500 +0800 +++ 0038-net-virtio-fix-getline-memory-leakage.patch 2021-06-12 06:53:56.190000000 +0800 @@ -1 +1 @@ -From 9f528374bffb5868ec6bf896f57919a709b31911 Mon Sep 17 00:00:00 2001 +From 0f0469489b1a11ac46975e2b53f5ff8d42692446 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 9f528374bffb5868ec6bf896f57919a709b31911 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 79bd31ed82..e85906e9eb 100644 +index 45edd2ae60..0906a34799 100644 @@ -22 +24 @@ -@@ -360,7 +360,7 @@ vdpa_dynamic_major_num(void) +@@ -584,7 +584,7 @@ vdpa_dynamic_major_num(void) @@ -31 +33 @@ -@@ -380,6 +380,7 @@ vdpa_dynamic_major_num(void) +@@ -604,6 +604,7 @@ vdpa_dynamic_major_num(void)