Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

1 files changed, 16 insertions, 9 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index e4e5f025d16b..5fb9b7dd9831 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4466,6 +4466,7 @@ static int parse_station_flags(struct genl_info *info,
                 params->sta_flags_mask = BIT(NL80211_STA_FLAG_AUTHENTICATED) |
                                          BIT(NL80211_STA_FLAG_MFP) |
                                          BIT(NL80211_STA_FLAG_AUTHORIZED);
+                break;
         default:
                 return -EINVAL;
         }
@@ -15029,20 +15030,24 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie,
 EXPORT_SYMBOL(cfg80211_mgmt_tx_status);
 
 static int __nl80211_rx_control_port(struct net_device *dev,
-                                     const u8 *buf, size_t len,
-                                     const u8 *addr, u16 proto,
+                                     struct sk_buff *skb,
                                      bool unencrypted, gfp_t gfp)
 {
         struct wireless_dev *wdev = dev->ieee80211_ptr;
         struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
+        struct ethhdr *ehdr = eth_hdr(skb);
+        const u8 *addr = ehdr->h_source;
+        u16 proto = be16_to_cpu(skb->protocol);
         struct sk_buff *msg;
         void *hdr;
+        struct nlattr *frame;
+
         u32 nlportid = READ_ONCE(wdev->conn_owner_nlportid);
 
         if (!nlportid)
                 return -ENOENT;
 
-        msg = nlmsg_new(100 + len, gfp);
+        msg = nlmsg_new(100 + skb->len, gfp);
         if (!msg)
                 return -ENOMEM;
 
@@ -15056,13 +15061,17 @@ static int __nl80211_rx_control_port(struct net_device *dev,
             nla_put_u32(msg, NL80211_ATTR_IFINDEX, dev->ifindex) ||
             nla_put_u64_64bit(msg, NL80211_ATTR_WDEV, wdev_id(wdev),
                               NL80211_ATTR_PAD) ||
-            nla_put(msg, NL80211_ATTR_FRAME, len, buf) ||
             nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr) ||
             nla_put_u16(msg, NL80211_ATTR_CONTROL_PORT_ETHERTYPE, proto) ||
             (unencrypted && nla_put_flag(msg,
                                          NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT)))
                 goto nla_put_failure;
 
+        frame = nla_reserve(msg, NL80211_ATTR_FRAME, skb->len);
+        if (!frame)
+                goto nla_put_failure;
+
+        skb_copy_bits(skb, 0, nla_data(frame), skb->len);
         genlmsg_end(msg, hdr);
 
         return genlmsg_unicast(wiphy_net(&rdev->wiphy), msg, nlportid);
@@ -15073,14 +15082,12 @@ static int __nl80211_rx_control_port(struct net_device *dev,
 }
 
 bool cfg80211_rx_control_port(struct net_device *dev,
-                              const u8 *buf, size_t len,
-                              const u8 *addr, u16 proto, bool unencrypted)
+                              struct sk_buff *skb, bool unencrypted)
 {
         int ret;
 
-        trace_cfg80211_rx_control_port(dev, buf, len, addr, proto, unencrypted);
-        ret = __nl80211_rx_control_port(dev, buf, len, addr, proto,
-                                        unencrypted, GFP_ATOMIC);
+        trace_cfg80211_rx_control_port(dev, skb, unencrypted);
+        ret = __nl80211_rx_control_port(dev, skb, unencrypted, GFP_ATOMIC);
         trace_cfg80211_return_bool(ret == 0);
         return ret == 0;
 }