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 0811445804 for ; Fri, 23 Aug 2024 18:23:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02C864338D; Fri, 23 Aug 2024 18:23:43 +0200 (CEST) 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 7993E4336D for ; Fri, 23 Aug 2024 18:23:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430221; 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=+m1bQk6sneQ2c7owSBI7d2wbwkL/ncM/ybbphlQVEYU=; b=bL6rESSxwpQytz2D7rdh3aRsKiPEnnTX+ePDLHk8plXsbvyFpEE4iSkYg3fPcOTAQYNwwd KwwAIBX6YYV0C8bPkfR0ctSQd92WvAPA+vV2FG3ZX4c+zR7UCmAOQDN7lbwZSXcSVqbNJR xg6yWHfx1C6W8cp5uMiyoNwh22HAHJg= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-303-f-WtQgmKPW-AfplZo2TeVg-1; Fri, 23 Aug 2024 12:23:37 -0400 X-MC-Unique: f-WtQgmKPW-AfplZo2TeVg-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B4DB419560AB; Fri, 23 Aug 2024 16:23:36 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 958A01955F45; Fri, 23 Aug 2024 16:23:34 +0000 (UTC) From: Kevin Traynor To: Vladimir Medvedkin Cc: Michael Theodore Stolarchuk , Bruce Richardson , dpdk stable Subject: patch 'net/ice: fix memory leaks in raw pattern parsing' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:19:03 +0100 Message-ID: <20240823161929.1004778-115-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/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/709ee2dfaab9cc92f0216cacf6867362ea2e5302 Thanks. Kevin --- >From 709ee2dfaab9cc92f0216cacf6867362ea2e5302 Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Mon, 22 Jul 2024 13:50:44 +0000 Subject: [PATCH] net/ice: fix memory leaks in raw pattern parsing [ upstream commit 8044e1d19db3d0012bd1348cb4fcf542d31cd41a ] This patch fixes possible memory leaks inside the ice_hash_parse_raw_pattern() due to the lack of a call to rte_free() for previously allocated pkt_buf and msk_buf. Fixes: 1b9c68120a1c ("net/ice: enable protocol agnostic flow offloading in RSS") Reported-by: Michael Theodore Stolarchuk Signed-off-by: Vladimir Medvedkin Acked-by: Bruce Richardson --- .mailmap | 1 + drivers/net/ice/ice_hash.c | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.mailmap b/.mailmap index 8b2d737827..528065d28d 100644 --- a/.mailmap +++ b/.mailmap @@ -915,4 +915,5 @@ Michael Savisko Michael Shamis Michael S. Tsirkin +Michael Theodore Stolarchuk Michael Wildt Michal Berger diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c index 52646e9408..6fcfc5fc4c 100644 --- a/drivers/net/ice/ice_hash.c +++ b/drivers/net/ice/ice_hash.c @@ -658,5 +658,5 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad, uint8_t tmp_val = 0; uint8_t tmp_c = 0; - int i, j; + int i, j, ret = 0; if (ad->psr == NULL) @@ -678,6 +678,8 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad, msk_buf = rte_zmalloc(NULL, pkt_len, 0); - if (!msk_buf) + if (!msk_buf) { + rte_free(pkt_buf); return -ENOMEM; + } /* convert string to int array */ @@ -716,16 +718,20 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad, } - if (ice_parser_run(ad->psr, pkt_buf, pkt_len, &rslt)) - return -rte_errno; + ret = ice_parser_run(ad->psr, pkt_buf, pkt_len, &rslt); + if (ret) + goto free_mem; - if (ice_parser_profile_init(&rslt, pkt_buf, msk_buf, - pkt_len, ICE_BLK_RSS, true, &prof)) - return -rte_errno; + ret = ice_parser_profile_init(&rslt, pkt_buf, msk_buf, + pkt_len, ICE_BLK_RSS, true, &prof); + if (ret) + goto free_mem; rte_memcpy(&meta->raw.prof, &prof, sizeof(prof)); +free_mem: rte_free(pkt_buf); rte_free(msk_buf); - return 0; + + return ret; } -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:13.130535014 +0100 +++ 0115-net-ice-fix-memory-leaks-in-raw-pattern-parsing.patch 2024-08-23 17:18:09.864430608 +0100 @@ -1 +1 @@ -From 8044e1d19db3d0012bd1348cb4fcf542d31cd41a Mon Sep 17 00:00:00 2001 +From 709ee2dfaab9cc92f0216cacf6867362ea2e5302 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8044e1d19db3d0012bd1348cb4fcf542d31cd41a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index a6088813cc..541ca895a4 100644 +index 8b2d737827..528065d28d 100644 @@ -25 +26 @@ -@@ -979,4 +979,5 @@ Michael Savisko +@@ -915,4 +915,5 @@ Michael Savisko @@ -32 +33 @@ -index f923641533..6b3095e2c5 100644 +index 52646e9408..6fcfc5fc4c 100644 @@ -35 +36 @@ -@@ -651,5 +651,5 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad, +@@ -658,5 +658,5 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad, @@ -42 +43 @@ -@@ -671,6 +671,8 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad, +@@ -678,6 +678,8 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad, @@ -52 +53 @@ -@@ -709,16 +711,20 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad, +@@ -716,16 +718,20 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad,