domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: use struct group to wipe psb6970 volatile priv data

Browse Source 
Instead of reference vlan and do strange subtraction, use the handy
struct_group() to create a virtual struct of the same size of the
members. This permits to have a more secure memset and fix compilation
warning in 6.1 where additional checks are done.

Fix compilation warning:
| inlined from 'psb6970_reset_switch' at drivers/net/phy/psb6970.c:275:2:
| ./include/linux/fortify-string.h:314:25: error: call to '__write_overflow_field'
| declared with attribute warning: detected write beyond size of field
| (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
|  314 |                         __write_overflow_field(p_size_field, size);
|      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|cc1: all warnings being treated as errors

Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl>
This commit is contained in:
Aleksander Jan Bajkowski
2023-05-25 22:20:15 +02:00
committed by Christian Lamparter
parent cc87f6629b
commit d69becd307
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/generic/files/drivers/net/phy/psb6970.c
View File

@@ -60,11 +60,13 @@ struct psb6970_priv {
struct mutex reg_mutex; struct mutex reg_mutex;
/* all fields below are cleared on reset */ /* all fields below are cleared on reset */
struct_group(psb6970_priv_volatile,
bool vlan; bool vlan;
u16 vlan_id[PSB6970_MAX_VLANS]; u16 vlan_id[PSB6970_MAX_VLANS];
u8 vlan_table[PSB6970_MAX_VLANS]; u8 vlan_table[PSB6970_MAX_VLANS];
u8 vlan_tagged; u8 vlan_tagged;
u16 pvid[PSB6970_NUM_PORTS]; u16 pvid[PSB6970_NUM_PORTS];
);
}; };
#define to_psb6970(_dev) container_of(_dev, struct psb6970_priv, dev) #define to_psb6970(_dev) container_of(_dev, struct psb6970_priv, dev)
@@ -272,8 +274,8 @@ static int psb6970_reset_switch(struct switch_dev *dev)
mutex_lock(&priv->reg_mutex); mutex_lock(&priv->reg_mutex);
memset(&priv->vlan, 0, sizeof(struct psb6970_priv) - memset(&priv->psb6970_priv_volatile, 0,
offsetof(struct psb6970_priv, vlan)); sizeof(priv->psb6970_priv_volatile));
for (i = 0; i < PSB6970_MAX_VLANS; i++) for (i = 0; i < PSB6970_MAX_VLANS; i++)
priv->vlan_id[i] = i; priv->vlan_id[i] = i;