Commit 6277fbfd authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

staging: wlan-ng: Remove pointless a3/a4 union 



There is no need for the a3/a4 union. The two structs are identical
except for the addition of a4. Excepting one place, the structs are
only ever used in the union, and the union is always allocated at full
size. The one instance of the a3-specific struct can be replaced with
the full version, as no sizing information is used. Replace the union
with the a4 version of the struct. "diffoscope" reports there are no
object code differences after this change.

Cc: Allen Pais <apais@linux.microsoft.com>
Cc: Romain Perier <romain.perier@gmail.com>
Cc: Chen Lin <chen.lin5@zte.com.cn>
Cc: Ivan Safonov <insafonov@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-staging@lists.linux.dev
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210819174537.3499227-2-keescook@chromium.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55cdf7d7

drivers/staging/wlan-ng/hfa384x.h

+1 −1
Original line number Diff line number Diff line
@@ -1423,7 +1423,7 @@ int hfa384x_drvr_start(struct hfa384x *hw); 
int hfa384x_drvr_stop(struct hfa384x *hw);

int

hfa384x_drvr_txframe(struct hfa384x *hw, struct sk_buff *skb,

		     union p80211_hdr *p80211_hdr,

		     struct p80211_hdr *p80211_hdr,

		     struct p80211_metawep *p80211_wep);

void hfa384x_tx_timeout(struct wlandevice *wlandev);

drivers/staging/wlan-ng/hfa384x_usb.c

+2 −2
Original line number Diff line number Diff line
@@ -2472,7 +2472,7 @@ int hfa384x_drvr_stop(struct hfa384x *hw) 
 *----------------------------------------------------------------

 */

int hfa384x_drvr_txframe(struct hfa384x *hw, struct sk_buff *skb,

			 union p80211_hdr *p80211_hdr,

			 struct p80211_hdr *p80211_hdr,

			 struct p80211_metawep *p80211_wep)

{

	int usbpktlen = sizeof(struct hfa384x_tx_frame);
@@ -2517,7 +2517,7 @@ int hfa384x_drvr_txframe(struct hfa384x *hw, struct sk_buff *skb, 


	/* copy the header over to the txdesc */

	memcpy(&hw->txbuff.txfrm.desc.frame_control, p80211_hdr,

	       sizeof(union p80211_hdr));

	       sizeof(struct p80211_hdr));



	/* if we're using host WEP, increase size by IV+ICV */

	if (p80211_wep->data) {

drivers/staging/wlan-ng/p80211conv.c

+24 −24
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static const u8 oui_8021h[] = { 0x00, 0x00, 0xf8 }; 
 *----------------------------------------------------------------

 */

int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv,

			struct sk_buff *skb, union p80211_hdr *p80211_hdr,

			struct sk_buff *skb, struct p80211_hdr *p80211_hdr,

			struct p80211_metawep *p80211_wep)

{

	__le16 fc;
@@ -175,21 +175,21 @@ int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv, 


	switch (wlandev->macmode) {

	case WLAN_MACMODE_IBSS_STA:

		memcpy(p80211_hdr->a3.a1, &e_hdr.daddr, ETH_ALEN);

		memcpy(p80211_hdr->a3.a2, wlandev->netdev->dev_addr, ETH_ALEN);

		memcpy(p80211_hdr->a3.a3, wlandev->bssid, ETH_ALEN);

		memcpy(p80211_hdr->a1, &e_hdr.daddr, ETH_ALEN);

		memcpy(p80211_hdr->a2, wlandev->netdev->dev_addr, ETH_ALEN);

		memcpy(p80211_hdr->a3, wlandev->bssid, ETH_ALEN);

		break;

	case WLAN_MACMODE_ESS_STA:

		fc |= cpu_to_le16(WLAN_SET_FC_TODS(1));

		memcpy(p80211_hdr->a3.a1, wlandev->bssid, ETH_ALEN);

		memcpy(p80211_hdr->a3.a2, wlandev->netdev->dev_addr, ETH_ALEN);

		memcpy(p80211_hdr->a3.a3, &e_hdr.daddr, ETH_ALEN);

		memcpy(p80211_hdr->a1, wlandev->bssid, ETH_ALEN);

		memcpy(p80211_hdr->a2, wlandev->netdev->dev_addr, ETH_ALEN);

		memcpy(p80211_hdr->a3, &e_hdr.daddr, ETH_ALEN);

		break;

	case WLAN_MACMODE_ESS_AP:

		fc |= cpu_to_le16(WLAN_SET_FC_FROMDS(1));

		memcpy(p80211_hdr->a3.a1, &e_hdr.daddr, ETH_ALEN);

		memcpy(p80211_hdr->a3.a2, wlandev->bssid, ETH_ALEN);

		memcpy(p80211_hdr->a3.a3, &e_hdr.saddr, ETH_ALEN);

		memcpy(p80211_hdr->a1, &e_hdr.daddr, ETH_ALEN);

		memcpy(p80211_hdr->a2, wlandev->bssid, ETH_ALEN);

		memcpy(p80211_hdr->a3, &e_hdr.saddr, ETH_ALEN);

		break;

	default:

		netdev_err(wlandev->netdev,
@@ -222,9 +222,9 @@ int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv, 


	/*      skb->nh.raw = skb->data; */



	p80211_hdr->a3.fc = fc;

	p80211_hdr->a3.dur = 0;

	p80211_hdr->a3.seq = 0;

	p80211_hdr->fc = fc;

	p80211_hdr->dur = 0;

	p80211_hdr->seq = 0;



	return 0;

}
@@ -281,7 +281,7 @@ int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv, 
	unsigned int payload_offset;

	u8 daddr[ETH_ALEN];

	u8 saddr[ETH_ALEN];

	union p80211_hdr *w_hdr;

	struct p80211_hdr *w_hdr;

	struct wlan_ethhdr *e_hdr;

	struct wlan_llc *e_llc;

	struct wlan_snap *e_snap;
@@ -291,21 +291,21 @@ int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv, 
	payload_length = skb->len - WLAN_HDR_A3_LEN - WLAN_CRC_LEN;

	payload_offset = WLAN_HDR_A3_LEN;



	w_hdr = (union p80211_hdr *)skb->data;

	w_hdr = (struct p80211_hdr *)skb->data;



	/* setup some vars for convenience */

	fc = le16_to_cpu(w_hdr->a3.fc);

	fc = le16_to_cpu(w_hdr->fc);

	if ((WLAN_GET_FC_TODS(fc) == 0) && (WLAN_GET_FC_FROMDS(fc) == 0)) {

		ether_addr_copy(daddr, w_hdr->a3.a1);

		ether_addr_copy(saddr, w_hdr->a3.a2);

		ether_addr_copy(daddr, w_hdr->a1);

		ether_addr_copy(saddr, w_hdr->a2);

	} else if ((WLAN_GET_FC_TODS(fc) == 0) &&

		   (WLAN_GET_FC_FROMDS(fc) == 1)) {

		ether_addr_copy(daddr, w_hdr->a3.a1);

		ether_addr_copy(saddr, w_hdr->a3.a3);

		ether_addr_copy(daddr, w_hdr->a1);

		ether_addr_copy(saddr, w_hdr->a3);

	} else if ((WLAN_GET_FC_TODS(fc) == 1) &&

		   (WLAN_GET_FC_FROMDS(fc) == 0)) {

		ether_addr_copy(daddr, w_hdr->a3.a3);

		ether_addr_copy(saddr, w_hdr->a3.a2);

		ether_addr_copy(daddr, w_hdr->a3);

		ether_addr_copy(saddr, w_hdr->a2);

	} else {

		payload_offset = WLAN_HDR_A4_LEN;

		if (payload_length < WLAN_HDR_A4_LEN - WLAN_HDR_A3_LEN) {
@@ -313,8 +313,8 @@ int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv, 
			return 1;

		}

		payload_length -= (WLAN_HDR_A4_LEN - WLAN_HDR_A3_LEN);

		ether_addr_copy(daddr, w_hdr->a4.a3);

		ether_addr_copy(saddr, w_hdr->a4.a4);

		ether_addr_copy(daddr, w_hdr->a3);

		ether_addr_copy(saddr, w_hdr->a4);

	}



	/* perform de-wep if necessary.. */

drivers/staging/wlan-ng/p80211conv.h

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ struct wlandevice; 
int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,

			struct sk_buff *skb);

int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv,

			struct sk_buff *skb, union p80211_hdr *p80211_hdr,

			struct sk_buff *skb, struct p80211_hdr *p80211_hdr,

			struct p80211_metawep *p80211_wep);



int p80211_stt_findproto(u16 proto);

drivers/staging/wlan-ng/p80211hdr.h

+1 −15
Original line number Diff line number Diff line
@@ -148,16 +148,7 @@ 


/* Generic 802.11 Header types */



struct p80211_hdr_a3 {

	__le16 fc;

	u16 dur;

	u8 a1[ETH_ALEN];

	u8 a2[ETH_ALEN];

	u8 a3[ETH_ALEN];

	u16 seq;

} __packed;



struct p80211_hdr_a4 {

struct p80211_hdr {

	u16 fc;

	u16 dur;

	u8 a1[ETH_ALEN];
@@ -167,11 +158,6 @@ struct p80211_hdr_a4 { 
	u8 a4[ETH_ALEN];

} __packed;



union p80211_hdr {

	struct p80211_hdr_a3 a3;

	struct p80211_hdr_a4 a4;

} __packed;



/* Frame and header length macros */



static inline u16 wlan_ctl_framelen(u16 fstype)