Commit 1ad8237e authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Kalle Valo
Browse files

wifi: wil6210: fix fortify warnings 



When compiling with gcc 13.1 and CONFIG_FORTIFY_SOURCE=y,
I've noticed the following:

In function ‘fortify_memcpy_chk’,
    inlined from ‘wil_rx_crypto_check_edma’ at drivers/net/wireless/ath/wil6210/txrx_edma.c:566:2:
./include/linux/fortify-string.h:529: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]
  529 |                         __read_overflow2_field(q_size_field, size);
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

where the compiler complains on:

const u8 *pn;
...
pn = (u8 *)&st->ext.pn_15_0;
...
memcpy(cc->pn, pn, IEEE80211_GCMP_PN_LEN);

and:

In function ‘fortify_memcpy_chk’,
    inlined from ‘wil_rx_crypto_check’ at drivers/net/wireless/ath/wil6210/txrx.c:684:2:
./include/linux/fortify-string.h:529: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]
  529 |                         __read_overflow2_field(q_size_field, size);
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

where the compiler complains on:

const u8 *pn = (u8 *)&d->mac.pn_15_0;
...
memcpy(cc->pn, pn, IEEE80211_GCMP_PN_LEN);

In both cases, the fortification logic interprets 'memcpy()' as 6-byte
overread of 2-byte field 'pn_15_0' of 'struct wil_rx_status_extension'
and 'pn_15_0' of 'struct vring_rx_mac', respectively. To silence
these warnings, last two fields of the aforementioned structures
are grouped using 'struct_group_attr(pn, __packed' quirk.

Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20230621093711.80118-1-dmantipov@yandex.ru
parent 061115fb

drivers/net/wireless/ath/wil6210/txrx.c

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ static int wil_rx_crypto_check(struct wil6210_priv *wil, struct sk_buff *skb) 
	struct wil_tid_crypto_rx *c = mc ? &s->group_crypto_rx :

				      &s->tid_crypto_rx[tid];

	struct wil_tid_crypto_rx_single *cc = &c->key_id[key_id];

	const u8 *pn = (u8 *)&d->mac.pn_15_0;

	const u8 *pn = (u8 *)&d->mac.pn;



	if (!cc->key_set) {

		wil_err_ratelimited(wil,

drivers/net/wireless/ath/wil6210/txrx.h

+4 −2
Original line number Diff line number Diff line
@@ -343,8 +343,10 @@ struct vring_rx_mac { 
	u32 d0;

	u32 d1;

	u16 w4;

	struct_group_attr(pn, __packed,

		u16 pn_15_0;

		u32 pn_47_16;

	);

} __packed;



/* Rx descriptor - DMA part

drivers/net/wireless/ath/wil6210/txrx_edma.c

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static int wil_rx_crypto_check_edma(struct wil6210_priv *wil, 
	s = &wil->sta[cid];

	c = mc ? &s->group_crypto_rx : &s->tid_crypto_rx[tid];

	cc = &c->key_id[key_id];

	pn = (u8 *)&st->ext.pn_15_0;

	pn = (u8 *)&st->ext.pn;



	if (!cc->key_set) {

		wil_err_ratelimited(wil,

drivers/net/wireless/ath/wil6210/txrx_edma.h

+4 −2
Original line number Diff line number Diff line
@@ -330,8 +330,10 @@ struct wil_rx_status_extension { 
	u32 d0;

	u32 d1;

	__le16 seq_num; /* only lower 12 bits */

	struct_group_attr(pn, __packed,

		u16 pn_15_0;

		u32 pn_47_16;

	);

} __packed;



struct wil_rx_status_extended {