]> git.droids-corp.org - dpdk.git/commitdiff
net/i40e: fix 32-bit build
authorFerruh Yigit <ferruh.yigit@intel.com>
Fri, 29 Oct 2021 10:37:01 +0000 (11:37 +0100)
committerQi Zhang <qi.z.zhang@intel.com>
Mon, 1 Nov 2021 01:15:25 +0000 (02:15 +0100)
Got error with: gcc 11.2.1 "cc (GCC) 11.2.1 20210728 (Red Hat 11.2.1-1)"

Build error:
In function ‘i40e_flow_parse_fdir_pattern’,
    inlined from ‘i40e_flow_parse_fdir_filter’
    at ../drivers/net/i40e/i40e_flow.c:3274:8:
../drivers/net/i40e/i40e_flow.c:3052:69:
    error: writing 1 byte into a region of size 0
    [-Werror=stringop-overflow=]
 3052 |                         filter->input.flow_ext.flexbytes[j] =
      |                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
 3053 |                                 raw_spec->pattern[i];
      |                                 ~~~~~~~~~~~~~~~~~~~~
In file included from ../drivers/net/i40e/i40e_flow.c:25:
  ../drivers/net/i40e/i40e_flow.c:
  In function ‘i40e_flow_parse_fdir_filter’:
  ../drivers/net/i40e/i40e_ethdev.h:638:17:
  note: at offset 16 into destination object ‘flexbytes’ of size 16
  638 |         uint8_t flexbytes[RTE_ETH_FDIR_MAX_FLEXLEN];
      |                 ^~~~~~~~~

Fixing by adding range checks.

Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR")
Cc: stable@dpdk.org
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
drivers/net/i40e/i40e_flow.c

index 9acaa1875105faa476a1caabe0d780112e1334da..c9676caab5dd2a12d87037dbb87ffd9cda322af5 100644 (file)
@@ -3049,6 +3049,9 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 
                        for (i = 0; i < raw_spec->length; i++) {
                                j = i + next_dst_off;
+                               if (j >= RTE_ETH_FDIR_MAX_FLEXLEN ||
+                                               j >= I40E_FDIR_MAX_FLEX_LEN)
+                                       break;
                                filter->input.flow_ext.flexbytes[j] =
                                        raw_spec->pattern[i];
                                filter->input.flow_ext.flex_mask[j] =