Skip to content

Commit 61752ac

Browse files
arndbkvalo
authored andcommitted
wifi: ath9k: work around memset overflow warning
gcc-9 and some other older versions produce a false-positive warning for zeroing two fields In file included from include/linux/string.h:369, from drivers/net/wireless/ath/ath9k/main.c:18: In function 'fortify_memset_chk', inlined from 'ath9k_ps_wakeup' at drivers/net/wireless/ath/ath9k/main.c:140:3: include/linux/fortify-string.h:462: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] 462 | __write_overflow_field(p_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Using a struct_group seems to reliably avoid the warning and not make the code much uglier. The combined memset() should even save a couple of cpu cycles. Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Toke Høiland-Jørgensen <[email protected]> Reviewed-by: Kees Cook <[email protected]> Signed-off-by: Kalle Valo <[email protected]> Link: https://msgid.link/[email protected]
1 parent 066afaf commit 61752ac

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

drivers/net/wireless/ath/ath.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,10 @@ struct ath_common {
171171
unsigned int clockrate;
172172

173173
spinlock_t cc_lock;
174-
struct ath_cycle_counters cc_ani;
175-
struct ath_cycle_counters cc_survey;
174+
struct_group(cc,
175+
struct ath_cycle_counters cc_ani;
176+
struct ath_cycle_counters cc_survey;
177+
);
176178

177179
struct ath_regulatory regulatory;
178180
struct ath_regulatory reg_world_copy;

drivers/net/wireless/ath/ath9k/main.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ void ath9k_ps_wakeup(struct ath_softc *sc)
135135
if (power_mode != ATH9K_PM_AWAKE) {
136136
spin_lock(&common->cc_lock);
137137
ath_hw_cycle_counters_update(common);
138-
memset(&common->cc_survey, 0, sizeof(common->cc_survey));
139-
memset(&common->cc_ani, 0, sizeof(common->cc_ani));
138+
memset(&common->cc, 0, sizeof(common->cc));
140139
spin_unlock(&common->cc_lock);
141140
}
142141

0 commit comments

Comments
 (0)