- 4.9.135

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 0660f7e9c47418fa4f7a2c15bbce828915779c2f..319191ce2821f2eacb3c4fdd4b50d92f33d2f795 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,57 +26,38 @@
                                exit
                        fi
                done
+From 5d12f71723762a39435d054d02bbf5fb87c5cd14 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
+Date: Mon, 6 Feb 2017 14:45:15 +0100
+Subject: [PATCH] mac80211: Print text for disassociation reason
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 7a0c800..ec5ebbb 100644
---- a/drivers/net/ethernet/realtek/r8169.c
-+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -4103,6 +4103,14 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
-       /* Get MAC address */
-       for (i = 0; i < ETH_ALEN; i++)
-               dev->dev_addr[i] = RTL_R8(MAC0 + i);
-+
-+      if (!is_valid_ether_addr(dev->dev_addr)) {
-+              /* Report it and use a random ethernet address instead */
-+              netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
-+              random_ether_addr(dev->dev_addr);
-+              netdev_info(dev, "Using random MAC address: %pM\n",
-+                          dev->dev_addr);
-+      }
-       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
- 
-       SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
--- 
-1.7.7.3
-
+When disassociation happens only numeric reason is printed
+in ieee80211_rx_mgmt_disassoc(). Add text variant, too.
 
-commit 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0
-Author: Mathias Krause <minipli@googlemail.com>
-Date:   Sat Feb 23 01:13:47 2013 +0000
+Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
+---
+ net/mac80211/mlme.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
-    sock_diag: Fix out-of-bounds access to sock_diag_handlers[]
-    
-    Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY
-    with a family greater or equal then AF_MAX -- the array size of
-    sock_diag_handlers[]. The current code does not test for this
-    condition therefore is vulnerable to an out-of-bound access opening
-    doors for a privilege escalation.
-    
-    Signed-off-by: Mathias Krause <minipli@googlemail.com>
-    Acked-by: Eric Dumazet <edumazet@google.com>
-    Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
-index 602cd63..750f44f 100644
---- a/net/core/sock_diag.c
-+++ b/net/core/sock_diag.c
-@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
-       if (nlmsg_len(nlh) < sizeof(*req))
-               return -EINVAL;
+diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
+index 098ce9b179ee..fcf8d0aa66ec 100644
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -2801,8 +2801,9 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
+ 
+       reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
  
-+      if (req->sdiag_family >= AF_MAX)
-+              return -EINVAL;
-+
-       hndl = sock_diag_lock_handler(req->sdiag_family);
-       if (hndl == NULL)
-               err = -ENOENT;
+-      sdata_info(sdata, "disassociated from %pM (Reason: %u)\n",
+-                 mgmt->sa, reason_code);
++      sdata_info(sdata, "disassociated from %pM (Reason: %u=%s)\n",
++                 mgmt->sa, reason_code,
++                 ieee80211_get_reason_code_string(reason_code));
+ 
+       ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
+ 
+-- 
+2.11.0
+