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 472C643829 for ; Tue, 5 Mar 2024 16:35:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4080242686; Tue, 5 Mar 2024 16:35:10 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id A170342670 for ; Tue, 5 Mar 2024 16:35:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652906; 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=+n/9o6deT/GEuvvA0qcX7ibpo4MTX8qc/6UwiRJ1tAs=; b=MSuxu/HZqV0c/shLa7/traNGZxvcezZH74oNzY4I0KcFDG3M8UH0OZHuh2ZwzrfqtU3KOI je3HOUUahMA9sAVgasN230QfBsE2PymrBdVoFrir03OkNpCEZ5iM9mQ0qGc8H6Q+nplqtj GowInoI4Wc1zuZfC6Ii6XTv1vfyu0yg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-133-zzlmggP7NrmhvE-VmTLaug-1; Tue, 05 Mar 2024 10:35:03 -0500 X-MC-Unique: zzlmggP7NrmhvE-VmTLaug-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id BE7C9101A593; Tue, 5 Mar 2024 15:35:02 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 098732022EDB; Tue, 5 Mar 2024 15:35:01 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix memory leak on security context error' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:37 +0000 Message-ID: <20240305153449.263666-4-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/24. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/835b8ab53cd43dfe312e027b3fcd932c8d8130ee Thanks. Kevin --- >From 835b8ab53cd43dfe312e027b3fcd932c8d8130ee Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Fri, 1 Dec 2023 18:46:49 +0800 Subject: [PATCH] net/iavf: fix memory leak on security context error [ upstream commit 8758ad5f8633ce4197271d41ece0cc7f799d3d6e ] In iavf_security_ctx_create() allocated memory for the 'security_ctx', we should free it when memory malloc for the 'iavf_security_ctx' fails, otherwise it will lead to memory leak. Fixes: 6bc987ecb860 ("net/iavf: support IPsec inline crypto") Signed-off-by: Yunjian Wang Acked-by: Qi Zhang --- drivers/net/iavf/iavf_ipsec_crypto.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_ipsec_crypto.c b/drivers/net/iavf/iavf_ipsec_crypto.c index 9ab09778e2..1fbffac6bc 100644 --- a/drivers/net/iavf/iavf_ipsec_crypto.c +++ b/drivers/net/iavf/iavf_ipsec_crypto.c @@ -1498,6 +1498,9 @@ iavf_security_ctx_create(struct iavf_adapter *adapter) adapter->security_ctx = rte_malloc("iavf_security_ctx", sizeof(struct iavf_security_ctx), 0); - if (adapter->security_ctx == NULL) + if (adapter->security_ctx == NULL) { + rte_free(adapter->vf.eth_dev->security_ctx); + adapter->vf.eth_dev->security_ctx = NULL; return -ENOMEM; + } } -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:54.843722404 +0000 +++ 0004-net-iavf-fix-memory-leak-on-security-context-error.patch 2024-03-05 14:08:54.597520625 +0000 @@ -1 +1 @@ -From 8758ad5f8633ce4197271d41ece0cc7f799d3d6e Mon Sep 17 00:00:00 2001 +From 835b8ab53cd43dfe312e027b3fcd932c8d8130ee Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8758ad5f8633ce4197271d41ece0cc7f799d3d6e ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 07a69db540..d6c0180ffd 100644 +index 9ab09778e2..1fbffac6bc 100644 @@ -24 +25 @@ -@@ -1519,6 +1519,9 @@ iavf_security_ctx_create(struct iavf_adapter *adapter) +@@ -1498,6 +1498,9 @@ iavf_security_ctx_create(struct iavf_adapter *adapter)