net/ice: fix raw flow input pattern value change in FDIR
PATCH 1/1 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.
--- drivers/net/ice/ice_fdir_filter.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
drivers/net/ice/ice_fdir_filter.c +19 -6
@@ -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;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 ; }
Signature · 1 line
2.17.1
Quoted 38 lines
-----Original Message-----
From: Xu, Ting <[email protected]>
Sent: Friday, March 18, 2022 11:17
To: [email protected]
Cc: Guo, Junfeng <[email protected]>; Xu, Ting <[email protected]>; [email protected]; Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>
Subject: [PATCH] net/ice: fix raw flow input pattern value change in FDIRWhen 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 offloadingin FDIR")
Signed-off-by Ting Xu <[email protected]>--- drivers/net/ice/ice_fdir_filter.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)drivers/net/ice/ice_fdir_filter.c +0
-0@@ -1868,14 +1868,15 @@ ice_fdir_parse_pattern(__rte_unused structice_adapter *ad, break;/* convert raw spec & mask from byte string to int */
drivers/net/ice/ice_fdir_filter.c +0
-1- unsigned char *tmp_spec =
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1879
Quoted 10 lines
drivers/net/ice/ice_fdir_filter.c +3
-1+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!
Quoted 69 lines
drivers/net/ice/ice_fdir_filter.c +0
-0int i, j; pkt_len = strlen((char *)(uintptr_t)raw_spec-Quoted 1 line
pattern);
drivers/net/ice/ice_fdir_filter.c +11
-1@@ -1883,8 +1884,18 @@ ice_fdir_parse_pattern(__rte_unused structice_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 ;drivers/net/ice/ice_fdir_filter.c +3
-2if (tmp >='A' && tmp <='F' )@@ -1893,7 +1904,7 @@ ice_fdir_parse_pattern(__rte_unused structice_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 ;drivers/net/ice/ice_fdir_filter.c +1
-1if (tmp >='A' && tmp <='F' )@@ -1910,7 +1921,7 @@ ice_fdir_parse_pattern(__rte_unused structice_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;
drivers/net/ice/ice_fdir_filter.c +2
-1if (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
PATCH v2 1/1 net/ice: fix raw flow input pattern value change in FDIR
In reply to Ting XuWhen 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.
--- drivers/net/ice/ice_fdir_filter.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
drivers/net/ice/ice_fdir_filter.c +19 -6
@@ -1868,10 +1868,11 @@ 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; +uint8_t *tmp_spec, *tmp_mask;uint16_t udp_port =0 ;uint16_t tmp_val =0 ;uint8_t pkt_len =0 ;
@@ -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 ; }
Signature · 1 line
2.17.1
Quoted 22 lines
-----Original Message-----
From: Xu, Ting <[email protected]>
Sent: Monday, March 28, 2022 09:49
To: [email protected]
Cc: Guo, Junfeng <[email protected]>; Xu, Ting <[email protected]>; [email protected]; Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>
Subject: [PATCH v2] net/ice: fix raw flow input pattern value change in FDIRWhen 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 offloadingin FDIR")
Quoted 7 lines
Signed-off-by Ting Xu <[email protected]>--- drivers/net/ice/ice_fdir_filter.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)--
2.17.1
Regards,
Junfeng Guo
PATCH v3 1/1 net/ice: fix raw flow input pattern value change in FDIR
In reply to Ting XuWhen 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.
--- drivers/net/ice/ice_fdir_filter.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
drivers/net/ice/ice_fdir_filter.c +19 -6
@@ -1870,10 +1870,11 @@ 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; +uint8_t *tmp_spec, *tmp_mask;uint16_t tmp_val =0 ;uint8_t pkt_len =0 ;uint8_t tmp =0 ;
@@ -1884,8 +1885,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' )
@@ -1894,7 +1905,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' )
@@ -1902,7 +1913,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' )
@@ -1911,7 +1922,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' )
@@ -1947,6 +1958,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, filter->parser_ena = true; +rte_free (tmp_spec); +rte_free (tmp_mask);break ; }
Signature · 1 line
2.17.1
Quoted 107 lines
-----Original Message-----
From: Xu, Ting <[email protected]>
Sent: Monday, April 18, 2022 2:59 PM
To: [email protected]
Cc: Guo, Junfeng <[email protected]>; Xu, Ting <[email protected]>; [email protected]; Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>
Subject: [PATCH v3] net/ice: fix raw flow input pattern value change in FDIRWhen 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 inFDIR")
Signed-off-by Ting Xu <[email protected]>--- drivers/net/ice/ice_fdir_filter.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)drivers/net/ice/ice_fdir_filter.c +3
-2@@ -1870,10 +1870,11 @@ ice_fdir_parse_pattern(__rte_unused structice_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; +uint8_t *tmp_spec, *tmp_mask;uint16_t tmp_val =0 ;uint8_t pkt_len =0 ;drivers/net/ice/ice_fdir_filter.c +11
-1uint8_t tmp =0 ;@@ -1884,8 +1885,18 @@ ice_fdir_parse_pattern(__rte_unused structice_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 ;drivers/net/ice/ice_fdir_filter.c +1
-1if (tmp >='A' && tmp <='F' )@@ -1894,7 +1905,7 @@ ice_fdir_parse_pattern(__rte_unused structice_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 ;drivers/net/ice/ice_fdir_filter.c +1
-1if (tmp >='A' && tmp <='F' )@@ -1902,7 +1913,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 ;drivers/net/ice/ice_fdir_filter.c +1
-1if (tmp >='A' && tmp <='F' )@@ -1911,7 +1922,7 @@ ice_fdir_parse_pattern(__rte_unused structice_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 ;drivers/net/ice/ice_fdir_filter.c +2
-1if (tmp >='A' && tmp <='F' )@@ -1947,6 +1958,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, filter->parser_ena = true; +rte_free (tmp_spec); +rte_free (tmp_mask);break ; } --
Quoted 1 line
2.17.1
Added
Applied to dpdk-next-net-intel.
Thanks
Qi