From: Kevin Traynor <ktraynor@redhat.com> To: Ting Xu <ting.xu@intel.com> Cc: Junfeng Guo <junfeng.guo@intel.com>, dpdk stable <stable@dpdk.org> 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> (raw) In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> 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 <ting.xu@intel.com> 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 <ting.xu@intel.com> Acked-by: Junfeng Guo <junfeng.guo@intel.com> --- 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,
next prev parent reply other threads:[~2022-05-10 12:30 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-10 12:29 patch 'eal/windows: add missing C++ include guards' " Kevin Traynor 2022-05-10 12:29 ` patch 'net/dpaa2: fix dpdmux default interface' " Kevin Traynor 2022-05-10 12:29 ` patch 'examples/bond: fix invalid use of trylock' " Kevin Traynor 2022-05-10 12:29 ` patch 'test/bpf: skip test if libpcap is unavailable' " Kevin Traynor 2022-05-10 12:29 ` patch 'net/ice: improve performance of Rx timestamp offload' " Kevin Traynor 2022-05-10 12:29 ` patch 'net/i40e: populate error in flow director parser' " Kevin Traynor 2022-05-10 12:29 ` patch 'net/ice: add missing Tx burst mode name' " Kevin Traynor 2022-05-10 12:29 ` patch 'net/ice: refactor parser usage' " Kevin Traynor 2022-05-10 12:29 ` Kevin Traynor [this message] 2022-05-10 12:29 ` patch 'net/netvsc: fix calculation of checksums based on mbuf flag' " Kevin Traynor 2022-05-10 12:29 ` patch 'common/mlx5: fix memory region range calculation' " Kevin Traynor 2022-05-10 12:29 ` patch 'net/mlx5: fix Tx when inlining is impossible' " Kevin Traynor 2022-05-10 12:29 ` patch 'net/mlx5: fix probing with secondary bonding member' " Kevin Traynor 2022-05-10 12:29 ` patch 'net/mlx5: fix counter in non-termination meter' " Kevin Traynor 2022-05-10 12:29 ` patch 'net/mlx5: restrict Rx queue array access to boundary' " Kevin Traynor 2022-05-10 12:29 ` patch 'net/mlx5: fix GTP handling in header modify action' " Kevin Traynor 2022-05-10 12:29 ` patch 'net/mlx5: fix Rx/Tx stats concurrency' " Kevin Traynor 2022-05-10 12:29 ` patch 'test/table: fix buffer overflow on lpm entry' " Kevin Traynor 2022-05-10 12:29 ` patch 'mem: skip attaching external memory in secondary process' " Kevin Traynor 2022-05-10 12:29 ` patch 'malloc: fix ASan handling for unmapped memory' " Kevin Traynor 2022-05-10 12:29 ` patch 'eal: fix C++ include for device event and DMA' " Kevin Traynor 2022-05-10 12:29 ` patch 'crypto/dpaa_sec: fix digest size' " Kevin Traynor 2022-05-10 12:30 ` patch 'security: fix SA lifetime comments' " Kevin Traynor 2022-05-10 12:30 ` patch 'crypto/mlx5: fix login cleanup' " Kevin Traynor 2022-05-10 12:30 ` patch 'crypto/dpaa2_sec: fix fle buffer leak' " Kevin Traynor 2022-05-10 12:30 ` patch 'crypto/dpaa2_sec: fix buffer pool ID check' " Kevin Traynor 2022-05-10 12:30 ` patch 'crypto/dpaa_sec: fix chained FD length in raw datapath' " Kevin Traynor 2022-05-10 12:30 ` patch 'crypto/dpaa2_sec: " Kevin Traynor 2022-05-10 12:30 ` patch 'crypto/dpaa_sec: fix secondary process probing' " Kevin Traynor 2022-05-10 12:30 ` patch 'crypto/dpaa2_sec: fix crypto operation pointer' " Kevin Traynor 2022-05-10 12:30 ` patch 'crypto/dpaa2_sec: fix operation status for simple FD' " Kevin Traynor 2022-05-10 12:30 ` patch 'common/dpaax: fix short MAC-I IV calculation for ZUC' " Kevin Traynor 2022-05-10 12:30 ` patch 'examples/l2fwd-crypto: fix stats refresh rate' " Kevin Traynor
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220510123010.159523-9-ktraynor@redhat.com \ --to=ktraynor@redhat.com \ --cc=junfeng.guo@intel.com \ --cc=stable@dpdk.org \ --cc=ting.xu@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git