From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7E87FA04B1 for ; Thu, 5 Nov 2020 13:41:29 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7994CC31F; Thu, 5 Nov 2020 13:41:28 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id C3CBBC31F for ; Thu, 5 Nov 2020 13:41:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580085; 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=CDOCf4IrlPJUOswNGNNxCE7VB9gjAL6V2i76MglcLPQ=; b=e9kMAo1gisIiQ1kEAr76F5V1pv20qoNBgikBaw4jkn294wk7SWggZ/UU0/GSRTSzrXWpyX MoNf7j2FVthhbe7zWv0M/+31y2Q0oC7DDoEgloQS3tQx+EYJMzBKXnRu3BGHWOCrr9HzJO vRgQsm4J6145tkqZ4h0FwvMb8M923zo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-505-NdWvzgZiPuiTwel6qKL3Lw-1; Thu, 05 Nov 2020 07:41:22 -0500 X-MC-Unique: NdWvzgZiPuiTwel6qKL3Lw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 11B91805EF7; Thu, 5 Nov 2020 12:41:21 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A0725C3E1; Thu, 5 Nov 2020 12:41:19 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Qi Zhang , dpdk stable Date: Thu, 5 Nov 2020 12:39:36 +0000 Message-Id: <20201105124015.306404-29-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/fm10k: fix memory leak when thresh check fails' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/79591394238421d9ae03c2863f25872e0a465c23 Thanks. Kevin. --- >From 79591394238421d9ae03c2863f25872e0a465c23 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 28 Sep 2020 20:44:42 +0800 Subject: [PATCH] net/fm10k: fix memory leak when thresh check fails [ upstream commit c87a6de2a130c436fcf73b27f829c48e8249bcc4 ] In fm10k_rx_queue_setup(), we allocate memory for the queue structure but not released when thresh check fails. Fixes: 6cfe8969c969 ("fm10k: add Rx queue setup/release") Signed-off-by: Yunjian Wang Acked-by: Qi Zhang --- drivers/net/fm10k/fm10k_ethdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index f64d07bbad..4b57a96c8b 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -1862,7 +1862,8 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, &((uint32_t *)hw->hw_addr)[FM10K_RDT(queue_id)]; q->offloads = offloads; - if (handle_rxconf(q, conf)) + if (handle_rxconf(q, conf)) { + rte_free(q); return -EINVAL; - + } /* allocate memory for the software ring */ q->sw_ring = rte_zmalloc_socket("fm10k sw ring", -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.807500839 +0000 +++ 0029-net-fm10k-fix-memory-leak-when-thresh-check-fails.patch 2020-11-05 12:38:54.210895996 +0000 @@ -1 +1 @@ -From c87a6de2a130c436fcf73b27f829c48e8249bcc4 Mon Sep 17 00:00:00 2001 +From 79591394238421d9ae03c2863f25872e0a465c23 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c87a6de2a130c436fcf73b27f829c48e8249bcc4 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 5771d83b55..98e396b8e7 100644 +index f64d07bbad..4b57a96c8b 100644 @@ -22 +23 @@ -@@ -1842,7 +1842,8 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, +@@ -1862,7 +1862,8 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,