domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: sync rx STP fix with updated version

Browse Source 
Add back skb length check and fix a minor issue in protocol detection

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau
2022-10-07 14:58:41 +02:00
parent cec7dfa497
commit f6c359a655
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
package/kernel/mac80211/patches/subsys/344-wifi-cfg80211-fix-ieee80211_data_to_8023_exthdr-hand.patch
View File

@@ -15,16 +15,16 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/wireless/util.c --- a/net/wireless/util.c
+++ b/net/wireless/util.c +++ b/net/wireless/util.c
@@ -557,8 +557,6 @@ int ieee80211_data_to_8023_exthdr(struct @@ -557,7 +557,7 @@ int ieee80211_data_to_8023_exthdr(struct
return -1; return -1;
hdrlen = ieee80211_hdrlen(hdr->frame_control) + data_offset; hdrlen = ieee80211_hdrlen(hdr->frame_control) + data_offset;
- if (skb->len < hdrlen + 8) - if (skb->len < hdrlen + 8)
- return -1; + if (skb->len < hdrlen)
return -1;
/* convert IEEE 802.11 header + possible LLC headers into Ethernet /* convert IEEE 802.11 header + possible LLC headers into Ethernet
* header @@ -572,8 +572,9 @@ int ieee80211_data_to_8023_exthdr(struct
@@ -572,8 +570,9 @@ int ieee80211_data_to_8023_exthdr(struct
memcpy(tmp.h_dest, ieee80211_get_DA(hdr), ETH_ALEN); memcpy(tmp.h_dest, ieee80211_get_DA(hdr), ETH_ALEN);
memcpy(tmp.h_source, ieee80211_get_SA(hdr), ETH_ALEN); memcpy(tmp.h_source, ieee80211_get_SA(hdr), ETH_ALEN);
@@ -36,7 +36,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
mesh_flags &= MESH_FLAGS_AE; mesh_flags &= MESH_FLAGS_AE;
@@ -593,11 +592,12 @@ int ieee80211_data_to_8023_exthdr(struct @@ -593,11 +594,12 @@ int ieee80211_data_to_8023_exthdr(struct
if (iftype == NL80211_IFTYPE_MESH_POINT) { if (iftype == NL80211_IFTYPE_MESH_POINT) {
if (mesh_flags == MESH_FLAGS_AE_A4) if (mesh_flags == MESH_FLAGS_AE_A4)
return -1; return -1;
@@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
hdrlen += __ieee80211_get_mesh_hdrlen(mesh_flags); hdrlen += __ieee80211_get_mesh_hdrlen(mesh_flags);
} }
break; break;
@@ -611,10 +611,11 @@ int ieee80211_data_to_8023_exthdr(struct @@ -611,10 +613,11 @@ int ieee80211_data_to_8023_exthdr(struct
if (iftype == NL80211_IFTYPE_MESH_POINT) { if (iftype == NL80211_IFTYPE_MESH_POINT) {
if (mesh_flags == MESH_FLAGS_AE_A5_A6) if (mesh_flags == MESH_FLAGS_AE_A5_A6)
return -1; return -1;
@@ -70,7 +70,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
hdrlen += __ieee80211_get_mesh_hdrlen(mesh_flags); hdrlen += __ieee80211_get_mesh_hdrlen(mesh_flags);
} }
break; break;
@@ -626,18 +627,18 @@ int ieee80211_data_to_8023_exthdr(struct @@ -626,18 +629,18 @@ int ieee80211_data_to_8023_exthdr(struct
break; break;
} }
@@ -78,12 +78,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
- tmp.h_proto = payload.proto; - tmp.h_proto = payload.proto;
- -
- if (likely((!is_amsdu && ether_addr_equal(payload.hdr, rfc1042_header) && - if (likely((!is_amsdu && ether_addr_equal(payload.hdr, rfc1042_header) &&
+ if (likely(skb_copy_bits(skb, hdrlen, &payload, sizeof(payload)) == 0) && - tmp.h_proto != htons(ETH_P_AARP) &&
+ likely((!is_amsdu && ether_addr_equal(payload.hdr, rfc1042_header) && - tmp.h_proto != htons(ETH_P_IPX)) ||
tmp.h_proto != htons(ETH_P_AARP) &&
tmp.h_proto != htons(ETH_P_IPX)) ||
- ether_addr_equal(payload.hdr, bridge_tunnel_header))) - ether_addr_equal(payload.hdr, bridge_tunnel_header)))
+ ether_addr_equal(payload.hdr, bridge_tunnel_header))) { + if (likely(skb_copy_bits(skb, hdrlen, &payload, sizeof(payload)) == 0 &&
+ ((!is_amsdu && ether_addr_equal(payload.hdr, rfc1042_header) &&
+ payload.proto != htons(ETH_P_AARP) &&
+ payload.proto != htons(ETH_P_IPX)) ||
+ ether_addr_equal(payload.hdr, bridge_tunnel_header)))) {
/* remove RFC1042 or Bridge-Tunnel encapsulation and /* remove RFC1042 or Bridge-Tunnel encapsulation and
* replace EtherType */ * replace EtherType */
hdrlen += ETH_ALEN + 2; hdrlen += ETH_ALEN + 2;