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 4AB3EA0C41 for ; Tue, 30 Nov 2021 17:37:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 43E0041148; Tue, 30 Nov 2021 17:37:56 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id B474A410F7 for ; Tue, 30 Nov 2021 17:37:54 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 80EDA40037 for ; Tue, 30 Nov 2021 16:37:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290274; bh=r7MVN0zPKXdkchO5jBHjIR1LyLIeYUT9Ucd+WyfHmes=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XbYhO+Kj0BBkp44dREIYSM8IwfzHkC0ueyB60qcha/exSarOMWh7gjoygnQ+0mDNg jvtu6HIqsbN6S3YE3/u+LlXFaguY70TNzXYZpYPAhpY1Pzc4R3KcRn1BMbVoTsvd7r Vc3NqFGRdpviuo1eW82UH09C1i6OBDiWFzC9iw2aQTnz1yZMvPqDH2a8crwx6i/db2 NebbWxgaCjC8JFM+0IVBTSCEQIG4KYOCO3PEI4/jZZ9ZD26wDJsasHtHmMfcaPNwq1 trlRppeAmQQOlHk5lVBPi0mgNcnVyCMFcizeAjdgrFjcfSEm/UsD82QHDv6CPr+n1d U7yk35BMiqhVQ== Received: by mail-ed1-f70.google.com with SMTP id d13-20020a056402516d00b003e7e67a8f93so17520294ede.0 for ; Tue, 30 Nov 2021 08:37:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r7MVN0zPKXdkchO5jBHjIR1LyLIeYUT9Ucd+WyfHmes=; b=qW0ucFTB2/eeBW7DmzNcXWzTCQbjqrnMyXMmZ5xQFkKCe7MfsNoALP397O4/MfiLiG MAGVNFQZlgleGiK+XBFuvx0lqZUTRrRX1sQG5F+sMavY0j8tQRyLrl0MqORFuAJ2EHSv 6imyb5LGFsqwyXvdZ66TpjMwfywgBbJ5F9QX/dyo+TgVVw+xDRRyxuDppsUL1jUXYC4n hypw0EmfHHMjbA+bS0Z1/m9L7NI2pHA05ysG0/D0ACazlUNvKJyfSmaGaVO4jhR0EZaR kcLFYFw//jYzzO0dQ5+nnWVRABliacIx51454CzQzTP7I/SZ2M2J+iHm/U6GlAa034b/ lHtg== X-Gm-Message-State: AOAM531YVjzShzoAB5AorspYIzddRdECYlBwJULRnHHtv4a6D9fZDDfR NL2CrLe6BQbcYc1WiSHOsjmB70c3L2yJe8HPpDhQSWap4InlP8ACOdTiC5T6gG95QP6fpKg7I+S CkgejmPalc85GtIdxEaCvThzd X-Received: by 2002:a17:907:6e9e:: with SMTP id sh30mr245730ejc.156.1638290273936; Tue, 30 Nov 2021 08:37:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwzBA+u1Dga2jL7Y8M3lNBRnYHuiyXbE/0yRhWpk1gORnK1AErRRSrBXLrPgLud5NrH4u74Ow== X-Received: by 2002:a17:907:6e9e:: with SMTP id sh30mr245712ejc.156.1638290273749; Tue, 30 Nov 2021 08:37:53 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id z1sm11621883edq.54.2021.11.30.08.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:37:53 -0800 (PST) From: christian.ehrhardt@canonical.com To: Qiming Chen Cc: Qi Zhang , dpdk stable Subject: patch 'net/i40e/base: fix resource leakage' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:59 +0100 Message-Id: <20211130163605.2460997-35-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.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 December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/c0773b56c2bc757589dd70411f8b118e55f78031 Thanks. Christian Ehrhardt --- >From c0773b56c2bc757589dd70411f8b118e55f78031 Mon Sep 17 00:00:00 2001 From: Qiming Chen Date: Sat, 21 Aug 2021 14:30:08 +0800 Subject: [PATCH] net/i40e/base: fix resource leakage [ upstream commit 071eb26fb53914aafda4aa33356f65d2c7a2e4e0 ] In the i40e_init_arq function, when the i40e_config_arq_regs function returns from processing failure, the previously applied arq_bufs resource is not released, which leads to leakage. The patch is processed in the same way as the i40e_init_asq function, maintaining a unified coding style. Fixes: 49ea51605be4 ("net/i40e/base: gracefully clean the resources") Signed-off-by: Qiming Chen Acked-by: Qi Zhang --- drivers/net/i40e/base/i40e_adminq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/base/i40e_adminq.c b/drivers/net/i40e/base/i40e_adminq.c index 584da0383c..0c07ff0045 100644 --- a/drivers/net/i40e/base/i40e_adminq.c +++ b/drivers/net/i40e/base/i40e_adminq.c @@ -468,7 +468,7 @@ enum i40e_status_code i40e_init_arq(struct i40e_hw *hw) /* initialize base registers */ ret_code = i40e_config_arq_regs(hw); if (ret_code != I40E_SUCCESS) - goto init_adminq_free_rings; + goto init_config_regs; /* success! */ hw->aq.arq.count = hw->aq.num_arq_entries; @@ -476,6 +476,10 @@ enum i40e_status_code i40e_init_arq(struct i40e_hw *hw) init_adminq_free_rings: i40e_free_adminq_arq(hw); + return ret_code; + +init_config_regs: + i40e_free_arq_bufs(hw); init_adminq_exit: return ret_code; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:08.113221633 +0100 +++ 0035-net-i40e-base-fix-resource-leakage.patch 2021-11-30 16:50:05.642872444 +0100 @@ -1 +1 @@ -From 071eb26fb53914aafda4aa33356f65d2c7a2e4e0 Mon Sep 17 00:00:00 2001 +From c0773b56c2bc757589dd70411f8b118e55f78031 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 071eb26fb53914aafda4aa33356f65d2c7a2e4e0 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 0da45f03e4..235667d57a 100644 +index 584da0383c..0c07ff0045 100644