3.18-stable patches

added patches:
	brcmfmac-fix-possible-buffer-overflow-in-brcmf_cfg80211_mgmt_tx.patch
	ipv6-dad-don-t-remove-dynamic-addresses-if-link-is-down.patch

diff --git a/queue-3.18/brcmfmac-fix-possible-buffer-overflow-in-brcmf_cfg80211_mgmt_tx.patch b/queue-3.18/brcmfmac-fix-possible-buffer-overflow-in-brcmf_cfg80211_mgmt_tx.patch
new file mode 100644 (file)
index 0000000..110c910
--- /dev/null
+++ b/queue-3.18/brcmfmac-fix-possible-buffer-overflow-in-brcmf_cfg80211_mgmt_tx.patch
@@ -0,0 +1,45 @@
+From 8f44c9a41386729fea410e688959ddaa9d51be7c Mon Sep 17 00:00:00 2001
+From: Arend van Spriel <arend.vanspriel@broadcom.com>
+Date: Fri, 7 Jul 2017 21:09:06 +0100
+Subject: brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Arend van Spriel <arend.vanspriel@broadcom.com>
+
+commit 8f44c9a41386729fea410e688959ddaa9d51be7c upstream.
+
+The lower level nl80211 code in cfg80211 ensures that "len" is between
+25 and NL80211_ATTR_FRAME (2304).  We subtract DOT11_MGMT_HDR_LEN (24) from
+"len" so thats's max of 2280.  However, the action_frame->data[] buffer is
+only BRCMF_FIL_ACTION_FRAME_SIZE (1800) bytes long so this memcpy() can
+overflow.
+
+       memcpy(action_frame->data, &buf[DOT11_MGMT_HDR_LEN],
+              le16_to_cpu(action_frame->len));
+
+Fixes: 18e2f61db3b70 ("brcmfmac: P2P action frame tx.")
+Reported-by: "freenerguo(郭大兴)" <freenerguo@tencent.com>
+Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+@@ -4108,6 +4108,11 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wip
+               cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true,
+                                       GFP_KERNEL);
+       } else if (ieee80211_is_action(mgmt->frame_control)) {
++              if (len > BRCMF_FIL_ACTION_FRAME_SIZE + DOT11_MGMT_HDR_LEN) {
++                      brcmf_err("invalid action frame length\n");
++                      err = -EINVAL;
++                      goto exit;
++              }
+               af_params = kzalloc(sizeof(*af_params), GFP_KERNEL);
+               if (af_params == NULL) {
+                       brcmf_err("unable to allocate frame\n");

diff --git a/queue-3.18/ipv6-dad-don-t-remove-dynamic-addresses-if-link-is-down.patch b/queue-3.18/ipv6-dad-don-t-remove-dynamic-addresses-if-link-is-down.patch
new file mode 100644 (file)
index 0000000..64f912d
--- /dev/null
+++ b/queue-3.18/ipv6-dad-don-t-remove-dynamic-addresses-if-link-is-down.patch
@@ -0,0 +1,80 @@
+From ec8add2a4c9df723c94a863b8fcd6d93c472deed Mon Sep 17 00:00:00 2001
+From: Sabrina Dubroca <sd@queasysnail.net>
+Date: Thu, 29 Jun 2017 16:56:54 +0200
+Subject: ipv6: dad: don't remove dynamic addresses if link is down
+
+From: Sabrina Dubroca <sd@queasysnail.net>
+
+commit ec8add2a4c9df723c94a863b8fcd6d93c472deed upstream.
+
+Currently, when the link for $DEV is down, this command succeeds but the
+address is removed immediately by DAD (1):
+
+    ip addr add 1111::12/64 dev $DEV valid_lft 3600 preferred_lft 1800
+
+In the same situation, this will succeed and not remove the address (2):
+
+    ip addr add 1111::12/64 dev $DEV
+    ip addr change 1111::12/64 dev $DEV valid_lft 3600 preferred_lft 1800
+
+The comment in addrconf_dad_begin() when !IF_READY makes it look like
+this is the intended behavior, but doesn't explain why:
+
+     * If the device is not ready:
+     * - keep it tentative if it is a permanent address.
+     * - otherwise, kill it.
+
+We clearly cannot prevent userspace from doing (2), but we can make (1)
+work consistently with (2).
+
+addrconf_dad_stop() is only called in two cases: if DAD failed, or to
+skip DAD when the link is down. In that second case, the fix is to avoid
+deleting the address, like we already do for permanent addresses.
+
+Fixes: 3c21edbd1137 ("[IPV6]: Defer IPv6 device initialization until the link becomes ready.")
+Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/ipv6/addrconf.c |   22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -1613,17 +1613,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
+ 
+ static void addrconf_dad_stop(struct inet6_ifaddr *ifp, int dad_failed)
+ {
+-      if (ifp->flags&IFA_F_PERMANENT) {
+-              spin_lock_bh(&ifp->lock);
+-              addrconf_del_dad_work(ifp);
+-              ifp->flags |= IFA_F_TENTATIVE;
+-              if (dad_failed)
+-                      ifp->flags |= IFA_F_DADFAILED;
+-              spin_unlock_bh(&ifp->lock);
+-              if (dad_failed)
+-                      ipv6_ifa_notify(0, ifp);
+-              in6_ifa_put(ifp);
+-      } else if (ifp->flags&IFA_F_TEMPORARY) {
++      if (ifp->flags&IFA_F_TEMPORARY) {
+               struct inet6_ifaddr *ifpub;
+               spin_lock_bh(&ifp->lock);
+               ifpub = ifp->ifpub;
+@@ -1636,6 +1626,16 @@ static void addrconf_dad_stop(struct ine
+                       spin_unlock_bh(&ifp->lock);
+               }
+               ipv6_del_addr(ifp);
++      } else if (ifp->flags&IFA_F_PERMANENT || !dad_failed) {
++              spin_lock_bh(&ifp->lock);
++              addrconf_del_dad_work(ifp);
++              ifp->flags |= IFA_F_TENTATIVE;
++              if (dad_failed)
++                      ifp->flags |= IFA_F_DADFAILED;
++              spin_unlock_bh(&ifp->lock);
++              if (dad_failed)
++                      ipv6_ifa_notify(0, ifp);
++              in6_ifa_put(ifp);
+       } else {
+               ipv6_del_addr(ifp);
+       }

diff --git a/queue-3.18/series b/queue-3.18/series
index a8d598ce52989bf043ab51506a55cda5c63314d0..60197df79aeaeb30c021743b56e392cc4b5472ca 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -1,3 +1,5 @@
 ipv6-avoid-unregistering-inet6_dev-for-loopback.patch
 tcp-reset-sk_rx_dst-in-tcp_disconnect.patch
 net-prevent-sign-extension-in-dev_get_stats.patch
+ipv6-dad-don-t-remove-dynamic-addresses-if-link-is-down.patch
+brcmfmac-fix-possible-buffer-overflow-in-brcmf_cfg80211_mgmt_tx.patch