Skip to content

Commit e55c50e

Browse files
GustavoARSilvaanguy11
authored andcommitted
i40e: Replace one-element array with flex-array member in struct i40e_package_header
One-element and zero-length arrays are deprecated. So, replace one-element array in struct i40e_package_header with flexible-array member. The `+ sizeof(u32)` adjustments ensure that there are no differences in binary output. Link: KSPP/linux#335 Signed-off-by: Gustavo A. R. Silva <[email protected]> Tested-by: Pucha Himasekhar Reddy <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]>
1 parent 29afcd6 commit e55c50e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/net/ethernet/intel/i40e/i40e_ddp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ static bool i40e_ddp_is_pkg_hdr_valid(struct net_device *netdev,
220220
netdev_err(netdev, "Invalid DDP profile - size is bigger than 4G");
221221
return false;
222222
}
223-
if (size < (sizeof(struct i40e_package_header) +
223+
if (size < (sizeof(struct i40e_package_header) + sizeof(u32) +
224224
sizeof(struct i40e_metadata_segment) + sizeof(u32) * 2)) {
225225
netdev_err(netdev, "Invalid DDP profile - size is too small.");
226226
return false;
@@ -281,7 +281,7 @@ int i40e_ddp_load(struct net_device *netdev, const u8 *data, size_t size,
281281
if (!i40e_ddp_is_pkg_hdr_valid(netdev, pkg_hdr, size))
282282
return -EINVAL;
283283

284-
if (size < (sizeof(struct i40e_package_header) +
284+
if (size < (sizeof(struct i40e_package_header) + sizeof(u32) +
285285
sizeof(struct i40e_metadata_segment) + sizeof(u32) * 2)) {
286286
netdev_err(netdev, "Invalid DDP recipe size.");
287287
return -EINVAL;

drivers/net/ethernet/intel/i40e/i40e_type.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1455,7 +1455,7 @@ struct i40e_ddp_version {
14551455
struct i40e_package_header {
14561456
struct i40e_ddp_version version;
14571457
u32 segment_count;
1458-
u32 segment_offset[1];
1458+
u32 segment_offset[];
14591459
};
14601460

14611461
/* Generic segment header */

0 commit comments

Comments
 (0)