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 11C54A00BE for ; Tue, 10 May 2022 14:30:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 010BE4282B; Tue, 10 May 2022 14:30:36 +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 799F44069D for ; Tue, 10 May 2022 14:30:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185833; 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=82JJlkydS7zFElG2LmlInXkcrZdoMikPTdrxESUL2RE=; b=SwsVeNyt123I47G27qWXPtxpd161e31AaoTpoDFkpYY5rwUNqMZ/fcxe39VcAp6Tg34KSJ E7Jy2/Gxs2c7rP+jLED9GnpwsUEncpuJf8aqX+zLtj5yO8SH9MMoyVUkYWeJVWgdzRYg5i 8q+tfFNn+SkT4s2r1WZfA5NYqDBEOaE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-269-XV9G8zJtMtaFraEjA4ytHg-1; Tue, 10 May 2022 08:30:32 -0400 X-MC-Unique: XV9G8zJtMtaFraEjA4ytHg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A4DB0802819; Tue, 10 May 2022 12:30:31 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id B2BCF40CFD06; Tue, 10 May 2022 12:30:30 +0000 (UTC) From: Kevin Traynor To: Ting Xu Cc: Junfeng Guo , dpdk stable Subject: patch 'net/ice: fix raw flow input pattern parsing' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:29:46 +0100 Message-Id: <20220510123010.159523-9-ktraynor@redhat.com> In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> References: <20220510123010.159523-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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"; 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.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 05/15/22. 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/21edf23c6d7a93fb6ca6a4e2eceb8cc3025fb291 Thanks. Kevin --- >From 21edf23c6d7a93fb6ca6a4e2eceb8cc3025fb291 Mon Sep 17 00:00:00 2001 From: Ting Xu Date: Mon, 18 Apr 2022 14:59:08 +0800 Subject: [PATCH] net/ice: fix raw flow input pattern parsing [ upstream commit 848de9572c83142e989394a699064d728eb892c3 ] When parsing raw flow pattern in FDIR, the input parameter spec and mask are used directly and the original value will be changed. It will cause error if these values are used in other functions. In this patch, temporary variables are created to store the spec and mask. Fixes: 25be39cc1760 ("net/ice: enable protocol agnostic flow offloading in FDIR") Signed-off-by: Ting Xu Acked-by: Junfeng Guo --- drivers/net/ice/ice_fdir_filter.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 99053978a9..72c8bd8f02 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -1873,8 +1873,9 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, /* convert raw spec & mask from byte string to int */ - unsigned char *tmp_spec = + unsigned char *spec_pattern = (uint8_t *)(uintptr_t)raw_spec->pattern; - unsigned char *tmp_mask = + unsigned char *mask_pattern = (uint8_t *)(uintptr_t)raw_mask->pattern; + uint8_t *tmp_spec, *tmp_mask; uint16_t tmp_val = 0; uint8_t pkt_len = 0; @@ -1887,6 +1888,16 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, return -rte_errno; + tmp_spec = rte_zmalloc(NULL, pkt_len / 2, 0); + if (!tmp_spec) + return -rte_errno; + + tmp_mask = rte_zmalloc(NULL, pkt_len / 2, 0); + if (!tmp_mask) { + rte_free(tmp_spec); + return -rte_errno; + } + for (i = 0, j = 0; i < pkt_len; i += 2, j++) { - tmp = tmp_spec[i]; + tmp = spec_pattern[i]; if (tmp >= 'a' && tmp <= 'f') tmp_val = tmp - 'a' + 10; @@ -1897,5 +1908,5 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, tmp_val *= 16; - tmp = tmp_spec[i + 1]; + tmp = spec_pattern[i + 1]; if (tmp >= 'a' && tmp <= 'f') tmp_spec[j] = tmp_val + tmp - 'a' + 10; @@ -1905,5 +1916,5 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, tmp_spec[j] = tmp_val + tmp - '0'; - tmp = tmp_mask[i]; + tmp = mask_pattern[i]; if (tmp >= 'a' && tmp <= 'f') tmp_val = tmp - 'a' + 10; @@ -1914,5 +1925,5 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, tmp_val *= 16; - tmp = tmp_mask[i + 1]; + tmp = mask_pattern[i + 1]; if (tmp >= 'a' && tmp <= 'f') tmp_mask[j] = tmp_val + tmp - 'a' + 10; @@ -1950,4 +1961,6 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, filter->parser_ena = true; + rte_free(tmp_spec); + rte_free(tmp_mask); break; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-10 13:24:21.822050019 +0100 +++ 0009-net-ice-fix-raw-flow-input-pattern-parsing.patch 2022-05-10 13:24:21.571646318 +0100 @@ -1 +1 @@ -From 848de9572c83142e989394a699064d728eb892c3 Mon Sep 17 00:00:00 2001 +From 21edf23c6d7a93fb6ca6a4e2eceb8cc3025fb291 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 848de9572c83142e989394a699064d728eb892c3 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 0982478feb..7914ba9407 100644 +index 99053978a9..72c8bd8f02 100644 @@ -24 +25 @@ -@@ -1871,8 +1871,9 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, +@@ -1873,8 +1873,9 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, @@ -36 +37 @@ -@@ -1885,6 +1886,16 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, +@@ -1887,6 +1888,16 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, @@ -54 +55 @@ -@@ -1895,5 +1906,5 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, +@@ -1897,5 +1908,5 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, @@ -61 +62 @@ -@@ -1903,5 +1914,5 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, +@@ -1905,5 +1916,5 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, @@ -68 +69 @@ -@@ -1912,5 +1923,5 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, +@@ -1914,5 +1925,5 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, @@ -75 +76 @@ -@@ -1948,4 +1959,6 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, +@@ -1950,4 +1961,6 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,