From b565215dc515f68b1aa48c879dd7c21a02ad189e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 30 Mar 2020 18:57:20 +0200 Subject: [PATCH] fuzz cleanup --- ...add-option-for-setting-control-flags.patch | 35 +++++++------------ ...e80211_tx_ctrl_port_ctrl_proto-for-n.patch | 13 +++---- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/queue-4.19/mac80211-add-option-for-setting-control-flags.patch b/queue-4.19/mac80211-add-option-for-setting-control-flags.patch index 23e46a5052a..ffbab04ea0c 100644 --- a/queue-4.19/mac80211-add-option-for-setting-control-flags.patch +++ b/queue-4.19/mac80211-add-option-for-setting-control-flags.patch @@ -15,16 +15,14 @@ Signed-off-by: Rajkumar Manoharan Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- - net/mac80211/ieee80211_i.h | 3 ++- - net/mac80211/tdls.c | 2 +- - net/mac80211/tx.c | 18 +++++++++++------- + net/mac80211/ieee80211_i.h | 3 ++- + net/mac80211/tdls.c | 2 +- + net/mac80211/tx.c | 18 +++++++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) -diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h -index cfd30671ccdf9..a879d8071712b 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -1729,7 +1729,8 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, +@@ -1729,7 +1729,8 @@ netdev_tx_t ieee80211_subif_start_xmit(s struct net_device *dev); void __ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev, @@ -34,11 +32,9 @@ index cfd30671ccdf9..a879d8071712b 100644 void ieee80211_purge_tx_queue(struct ieee80211_hw *hw, struct sk_buff_head *skbs); struct sk_buff * -diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c -index 67745d1d4c5d1..aa6fabfed3a70 100644 --- a/net/mac80211/tdls.c +++ b/net/mac80211/tdls.c -@@ -1055,7 +1055,7 @@ ieee80211_tdls_prep_mgmt_packet(struct wiphy *wiphy, struct net_device *dev, +@@ -1055,7 +1055,7 @@ ieee80211_tdls_prep_mgmt_packet(struct w /* disable bottom halves when entering the Tx path */ local_bh_disable(); @@ -47,11 +43,9 @@ index 67745d1d4c5d1..aa6fabfed3a70 100644 local_bh_enable(); return ret; -diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c -index cb84f2b411ae7..71159ee098ff6 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -2399,6 +2399,7 @@ static int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata, +@@ -2399,6 +2399,7 @@ static int ieee80211_lookup_ra_sta(struc * @sdata: virtual interface to build the header for * @skb: the skb to build the header in * @info_flags: skb flags to set @@ -59,7 +53,7 @@ index cb84f2b411ae7..71159ee098ff6 100644 * * This function takes the skb with 802.3 header and reformats the header to * the appropriate IEEE 802.11 header based on which interface the packet is -@@ -2414,7 +2415,7 @@ static int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata, +@@ -2414,7 +2415,7 @@ static int ieee80211_lookup_ra_sta(struc */ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, u32 info_flags, @@ -68,7 +62,7 @@ index cb84f2b411ae7..71159ee098ff6 100644 { struct ieee80211_local *local = sdata->local; struct ieee80211_tx_info *info; -@@ -2786,6 +2787,7 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata, +@@ -2786,6 +2787,7 @@ static struct sk_buff *ieee80211_build_h info->flags = info_flags; info->ack_frame_id = info_id; info->band = band; @@ -76,7 +70,7 @@ index cb84f2b411ae7..71159ee098ff6 100644 return skb; free: -@@ -3612,7 +3614,8 @@ EXPORT_SYMBOL(ieee80211_tx_dequeue); +@@ -3595,7 +3597,8 @@ EXPORT_SYMBOL(ieee80211_tx_dequeue); void __ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev, @@ -86,7 +80,7 @@ index cb84f2b411ae7..71159ee098ff6 100644 { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct sta_info *sta; -@@ -3683,7 +3686,8 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, +@@ -3666,7 +3669,8 @@ void __ieee80211_subif_start_xmit(struct skb->prev = NULL; skb->next = NULL; @@ -96,7 +90,7 @@ index cb84f2b411ae7..71159ee098ff6 100644 if (IS_ERR(skb)) goto out; -@@ -3823,9 +3827,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, +@@ -3806,9 +3810,9 @@ netdev_tx_t ieee80211_subif_start_xmit(s __skb_queue_head_init(&queue); ieee80211_convert_to_unicast(skb, dev, &queue); while ((skb = __skb_dequeue(&queue))) @@ -108,7 +102,7 @@ index cb84f2b411ae7..71159ee098ff6 100644 } return NETDEV_TX_OK; -@@ -3850,7 +3854,7 @@ ieee80211_build_data_template(struct ieee80211_sub_if_data *sdata, +@@ -3833,7 +3837,7 @@ ieee80211_build_data_template(struct iee goto out; } @@ -117,7 +111,7 @@ index cb84f2b411ae7..71159ee098ff6 100644 if (IS_ERR(skb)) goto out; -@@ -4887,7 +4891,7 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, +@@ -4870,7 +4874,7 @@ int ieee80211_tx_control_port(struct wip skb_reset_mac_header(skb); local_bh_disable(); @@ -126,6 +120,3 @@ index cb84f2b411ae7..71159ee098ff6 100644 local_bh_enable(); return 0; --- -2.20.1 - diff --git a/queue-4.19/mac80211-set-ieee80211_tx_ctrl_port_ctrl_proto-for-n.patch b/queue-4.19/mac80211-set-ieee80211_tx_ctrl_port_ctrl_proto-for-n.patch index 3603bf72fe0..6752b7228ee 100644 --- a/queue-4.19/mac80211-set-ieee80211_tx_ctrl_port_ctrl_proto-for-n.patch +++ b/queue-4.19/mac80211-set-ieee80211_tx_ctrl_port_ctrl_proto-for-n.patch @@ -18,11 +18,9 @@ Link: https://lore.kernel.org/r/20200326155333.f183f52b02f0.I4054e2a8c11c2ddcb79 Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- - net/mac80211/tx.c | 8 ++++++-- + net/mac80211/tx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c -index 71159ee098ff6..e2487da4024ba 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -4,7 +4,7 @@ @@ -34,7 +32,7 @@ index 71159ee098ff6..e2487da4024ba 100644 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as -@@ -4857,6 +4857,7 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, +@@ -4840,6 +4840,7 @@ int ieee80211_tx_control_port(struct wip struct ieee80211_local *local = sdata->local; struct sk_buff *skb; struct ethhdr *ehdr; @@ -42,7 +40,7 @@ index 71159ee098ff6..e2487da4024ba 100644 u32 flags; /* Only accept CONTROL_PORT_PROTOCOL configured in CONNECT/ASSOCIATE -@@ -4866,6 +4867,9 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, +@@ -4849,6 +4850,9 @@ int ieee80211_tx_control_port(struct wip proto != cpu_to_be16(ETH_P_PREAUTH)) return -EINVAL; @@ -52,7 +50,7 @@ index 71159ee098ff6..e2487da4024ba 100644 if (unencrypted) flags = IEEE80211_TX_INTFL_DONT_ENCRYPT; else -@@ -4891,7 +4895,7 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, +@@ -4874,7 +4878,7 @@ int ieee80211_tx_control_port(struct wip skb_reset_mac_header(skb); local_bh_disable(); @@ -61,6 +59,3 @@ index 71159ee098ff6..e2487da4024ba 100644 local_bh_enable(); return 0; --- -2.20.1 - -- 2.47.3