Skip to content

Commit 32d88cd

Browse files
committed
bnx2x: Set ivi->vlan field as an integer
JIRA: https://issues.redhat.com/browse/RHEL-52258 JIRA: https://issues.redhat.com/browse/RHEL-52667 commit a99ef54 Author: Simon Horman <horms@kernel.org> Date: Thu Aug 15 16:27:46 2024 +0100 bnx2x: Set ivi->vlan field as an integer In bnx2x_get_vf_config(): * The vlan field of ivi is a 32-bit integer, it is used to store a vlan ID. * The vlan field of bulletin is a 16-bit integer, it is also used to store a vlan ID. In the current code, ivi->vlan is set using memset. But in the case of setting it to the value of bulletin->vlan, this involves reading 32 bits from a 16bit source. This is likely safe, as the following 6 bytes are padding in the same structure, but none the less, it seems undesirable. However, it is entirely unclear to me how this scheme works on big-endian systems. Resolve this by simply assigning integer values to ivi->vlan. Flagged by W=1 builds. f.e. gcc-14 reports: In function 'fortify_memcpy_chk', inlined from 'bnx2x_get_vf_config' at .../bnx2x_sriov.c:2655:4: .../fortify-string.h:580:25: warning: call to '__read_overflow2_field' declared with attribute warning: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Wattribute-warning] 580 | __read_overflow2_field(q_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Compile tested only. Signed-off-by: Simon Horman <horms@kernel.org> Reviewed-by: Brett Creeley <brett.creeley@amd.com> Link: https://patch.msgid.link/20240815-bnx2x-int-vlan-v1-1-5940b76e37ad@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
1 parent 69fc7ba commit 32d88cd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2652,10 +2652,10 @@ int bnx2x_get_vf_config(struct net_device *dev, int vfidx,
26522652
/* vlan */
26532653
if (bulletin->valid_bitmap & (1 << VLAN_VALID))
26542654
/* vlan configured by ndo so its in bulletin board */
2655-
memcpy(&ivi->vlan, &bulletin->vlan, VLAN_HLEN);
2655+
ivi->vlan = bulletin->vlan;
26562656
else
26572657
/* function has not been loaded yet. Show vlans as 0s */
2658-
memset(&ivi->vlan, 0, VLAN_HLEN);
2658+
ivi->vlan = 0;
26592659

26602660
mutex_unlock(&bp->vfdb->bulletin_mutex);
26612661
}

0 commit comments

Comments
 (0)