patches for DPDK stable branches
 help / color / mirror / Atom feed
From: "Guo, Junfeng" <junfeng.guo@intel.com>
To: "Xu, Ting" <ting.xu@intel.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: "stable@dpdk.org" <stable@dpdk.org>,
	"Yang, Qiming" <qiming.yang@intel.com>,
	"Zhang, Qi Z" <qi.z.zhang@intel.com>
Subject: RE: [PATCH] net/ice: fix raw flow input pattern value change in FDIR
Date: Fri, 25 Mar 2022 06:33:24 +0000
Message-ID: <DM6PR11MB372362028DFAC8F2FE4FD363E71A9@DM6PR11MB3723.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20220318031650.2580-1-ting.xu@intel.com>



> -----Original Message-----
> From: Xu, Ting <ting.xu@intel.com>
> Sent: Friday, March 18, 2022 11:17
> To: dev@dpdk.org
> Cc: Guo, Junfeng <junfeng.guo@intel.com>; Xu, Ting
> <ting.xu@intel.com>; stable@dpdk.org; Yang, Qiming
> <qiming.yang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> Subject: [PATCH] net/ice: fix raw flow input pattern value change in FDIR
> 
> 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")
> 
> Cc: stable@dpdk.org
> 
> Signed-off-by: Ting Xu <ting.xu@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 7954c6d8ea..6e3851a71b 100644
> --- a/drivers/net/ice/ice_fdir_filter.c
> +++ b/drivers/net/ice/ice_fdir_filter.c
> @@ -1868,14 +1868,15 @@ ice_fdir_parse_pattern(__rte_unused struct
> ice_adapter *ad,
>  				break;
> 
>  			/* 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;
>  			uint16_t udp_port = 0;
>  			uint16_t tmp_val = 0;
>  			uint8_t pkt_len = 0;
>  			uint8_t tmp = 0;
> +			uint8_t *tmp_spec, *tmp_mask;

It would be better to shift this line of code UP four lines, to match the coding style.
The rest looks good on me. Thanks!

>  			int i, j;
> 
>  			pkt_len = strlen((char *)(uintptr_t)raw_spec-
> >pattern);
> @@ -1883,8 +1884,18 @@ ice_fdir_parse_pattern(__rte_unused struct
> ice_adapter *ad,
>  				pkt_len)
>  				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;
>  				if (tmp >= 'A' && tmp <= 'F')
> @@ -1893,7 +1904,7 @@ ice_fdir_parse_pattern(__rte_unused struct
> ice_adapter *ad,
>  					tmp_val = tmp - '0';
> 
>  				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;
>  				if (tmp >= 'A' && tmp <= 'F')
> @@ -1901,7 +1912,7 @@ ice_fdir_parse_pattern(__rte_unused struct
> ice_adapter *ad,
>  				if (tmp >= '0' && tmp <= '9')
>  					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;
>  				if (tmp >= 'A' && tmp <= 'F')
> @@ -1910,7 +1921,7 @@ ice_fdir_parse_pattern(__rte_unused struct
> ice_adapter *ad,
>  					tmp_val = tmp - '0';
> 
>  				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;
>  				if (tmp >= 'A' && tmp <= 'F')
> @@ -1953,6 +1964,8 @@ ice_fdir_parse_pattern(__rte_unused struct
> ice_adapter *ad,
> 
>  			filter->parser_ena = true;
> 
> +			rte_free(tmp_spec);
> +			rte_free(tmp_mask);
>  			break;
>  		}
> 
> --
> 2.17.1


  reply	other threads:[~2022-03-25  6:33 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-18  3:16 Ting Xu
2022-03-25  6:33 ` Guo, Junfeng [this message]
2022-03-28  1:49 ` [PATCH v2] " Ting Xu
2022-04-14  1:27   ` Guo, Junfeng
2022-04-18  6:59 ` [PATCH v3] " Ting Xu
2022-04-18  7:29   ` Zhang, Qi Z

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=DM6PR11MB372362028DFAC8F2FE4FD363E71A9@DM6PR11MB3723.namprd11.prod.outlook.com \
    --to=junfeng.guo@intel.com \
    --cc=dev@dpdk.org \
    --cc=qi.z.zhang@intel.com \
    --cc=qiming.yang@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