3.18-stable patches

added patches:
	arm-8692-1-mm-abort-uaccess-retries-upon-fatal-signal.patch
	bluetooth-properly-check-l2cap-config-option-output-buffer-length.patch

diff --git a/queue-3.18/arm-8692-1-mm-abort-uaccess-retries-upon-fatal-signal.patch b/queue-3.18/arm-8692-1-mm-abort-uaccess-retries-upon-fatal-signal.patch
new file mode 100644 (file)
index 0000000..d9a47f1
--- /dev/null
+++ b/queue-3.18/arm-8692-1-mm-abort-uaccess-retries-upon-fatal-signal.patch
@@ -0,0 +1,49 @@
+From 746a272e44141af24a02f6c9b0f65f4c4598ed42 Mon Sep 17 00:00:00 2001
+From: Mark Rutland <mark.rutland@arm.com>
+Date: Tue, 22 Aug 2017 11:36:17 +0100
+Subject: ARM: 8692/1: mm: abort uaccess retries upon fatal signal
+
+From: Mark Rutland <mark.rutland@arm.com>
+
+commit 746a272e44141af24a02f6c9b0f65f4c4598ed42 upstream.
+
+When there's a fatal signal pending, arm's do_page_fault()
+implementation returns 0. The intent is that we'll return to the
+faulting userspace instruction, delivering the signal on the way.
+
+However, if we take a fatal signal during fixing up a uaccess, this
+results in a return to the faulting kernel instruction, which will be
+instantly retried, resulting in the same fault being taken forever. As
+the task never reaches userspace, the signal is not delivered, and the
+task is left unkillable. While the task is stuck in this state, it can
+inhibit the forward progress of the system.
+
+To avoid this, we must ensure that when a fatal signal is pending, we
+apply any necessary fixup for a faulting kernel instruction. Thus we
+will return to an error path, and it is up to that code to make forward
+progress towards delivering the fatal signal.
+
+Signed-off-by: Mark Rutland <mark.rutland@arm.com>
+Reviewed-by: Steve Capper <steve.capper@arm.com>
+Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mm/fault.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/mm/fault.c
++++ b/arch/arm/mm/fault.c
+@@ -315,8 +315,11 @@ retry:
+        * signal first. We do not need to release the mmap_sem because
+        * it would already be released in __lock_page_or_retry in
+        * mm/filemap.c. */
+-      if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))
++      if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) {
++              if (!user_mode(regs))
++                      goto no_context;
+               return 0;
++      }
+ 
+       /*
+        * Major/minor page fault accounting is only done on the

diff --git a/queue-3.18/bluetooth-properly-check-l2cap-config-option-output-buffer-length.patch b/queue-3.18/bluetooth-properly-check-l2cap-config-option-output-buffer-length.patch
new file mode 100644 (file)
index 0000000..6712942
--- /dev/null
+++ b/queue-3.18/bluetooth-properly-check-l2cap-config-option-output-buffer-length.patch
@@ -0,0 +1,357 @@
+From e860d2c904d1a9f38a24eb44c9f34b8f915a6ea3 Mon Sep 17 00:00:00 2001
+From: Ben Seri <ben@armis.com>
+Date: Sat, 9 Sep 2017 23:15:59 +0200
+Subject: Bluetooth: Properly check L2CAP config option output buffer length
+
+From: Ben Seri <ben@armis.com>
+
+commit e860d2c904d1a9f38a24eb44c9f34b8f915a6ea3 upstream.
+
+Validate the output buffer length for L2CAP config requests and responses
+to avoid overflowing the stack buffer used for building the option blocks.
+
+Signed-off-by: Ben Seri <ben@armis.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/bluetooth/l2cap_core.c |   80 ++++++++++++++++++++++++---------------------
+ 1 file changed, 43 insertions(+), 37 deletions(-)
+
+--- a/net/bluetooth/l2cap_core.c
++++ b/net/bluetooth/l2cap_core.c
+@@ -58,7 +58,7 @@ static struct sk_buff *l2cap_build_cmd(s
+                                      u8 code, u8 ident, u16 dlen, void *data);
+ static void l2cap_send_cmd(struct l2cap_conn *conn, u8 ident, u8 code, u16 len,
+                          void *data);
+-static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data);
++static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data, size_t data_size);
+ static void l2cap_send_disconn_req(struct l2cap_chan *chan, int err);
+ 
+ static void l2cap_tx(struct l2cap_chan *chan, struct l2cap_ctrl *control,
+@@ -1434,7 +1434,7 @@ static void l2cap_conn_start(struct l2ca
+ 
+                       set_bit(CONF_REQ_SENT, &chan->conf_state);
+                       l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
+-                                     l2cap_build_conf_req(chan, buf), buf);
++                                     l2cap_build_conf_req(chan, buf, sizeof(buf)), buf);
+                       chan->num_conf_req++;
+               }
+ 
+@@ -2943,12 +2943,15 @@ static inline int l2cap_get_conf_opt(voi
+       return len;
+ }
+ 
+-static void l2cap_add_conf_opt(void **ptr, u8 type, u8 len, unsigned long val)
++static void l2cap_add_conf_opt(void **ptr, u8 type, u8 len, unsigned long val, size_t size)
+ {
+       struct l2cap_conf_opt *opt = *ptr;
+ 
+       BT_DBG("type 0x%2.2x len %u val 0x%lx", type, len, val);
+ 
++      if (size < L2CAP_CONF_OPT_SIZE + len)
++              return;
++
+       opt->type = type;
+       opt->len  = len;
+ 
+@@ -2973,7 +2976,7 @@ static void l2cap_add_conf_opt(void **pt
+       *ptr += L2CAP_CONF_OPT_SIZE + len;
+ }
+ 
+-static void l2cap_add_opt_efs(void **ptr, struct l2cap_chan *chan)
++static void l2cap_add_opt_efs(void **ptr, struct l2cap_chan *chan, size_t size)
+ {
+       struct l2cap_conf_efs efs;
+ 
+@@ -3001,7 +3004,7 @@ static void l2cap_add_opt_efs(void **ptr
+       }
+ 
+       l2cap_add_conf_opt(ptr, L2CAP_CONF_EFS, sizeof(efs),
+-                         (unsigned long) &efs);
++                         (unsigned long) &efs, size);
+ }
+ 
+ static void l2cap_ack_timeout(struct work_struct *work)
+@@ -3145,11 +3148,12 @@ static inline void l2cap_txwin_setup(str
+       chan->ack_win = chan->tx_win;
+ }
+ 
+-static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data)
++static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data, size_t data_size)
+ {
+       struct l2cap_conf_req *req = data;
+       struct l2cap_conf_rfc rfc = { .mode = chan->mode };
+       void *ptr = req->data;
++      void *endptr = data + data_size;
+       u16 size;
+ 
+       BT_DBG("chan %p", chan);
+@@ -3174,7 +3178,7 @@ static int l2cap_build_conf_req(struct l
+ 
+ done:
+       if (chan->imtu != L2CAP_DEFAULT_MTU)
+-              l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, chan->imtu);
++              l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, chan->imtu, endptr - ptr);
+ 
+       switch (chan->mode) {
+       case L2CAP_MODE_BASIC:
+@@ -3193,7 +3197,7 @@ done:
+               rfc.max_pdu_size    = 0;
+ 
+               l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
+-                                 (unsigned long) &rfc);
++                                 (unsigned long) &rfc, endptr - ptr);
+               break;
+ 
+       case L2CAP_MODE_ERTM:
+@@ -3213,21 +3217,21 @@ done:
+                                      L2CAP_DEFAULT_TX_WINDOW);
+ 
+               l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
+-                                 (unsigned long) &rfc);
++                                 (unsigned long) &rfc, endptr - ptr);
+ 
+               if (test_bit(FLAG_EFS_ENABLE, &chan->flags))
+-                      l2cap_add_opt_efs(&ptr, chan);
++                      l2cap_add_opt_efs(&ptr, chan, endptr - ptr);
+ 
+               if (test_bit(FLAG_EXT_CTRL, &chan->flags))
+                       l2cap_add_conf_opt(&ptr, L2CAP_CONF_EWS, 2,
+-                                         chan->tx_win);
++                                         chan->tx_win, endptr - ptr);
+ 
+               if (chan->conn->feat_mask & L2CAP_FEAT_FCS)
+                       if (chan->fcs == L2CAP_FCS_NONE ||
+                           test_bit(CONF_RECV_NO_FCS, &chan->conf_state)) {
+                               chan->fcs = L2CAP_FCS_NONE;
+                               l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1,
+-                                                 chan->fcs);
++                                                 chan->fcs, endptr - ptr);
+                       }
+               break;
+ 
+@@ -3245,17 +3249,17 @@ done:
+               rfc.max_pdu_size = cpu_to_le16(size);
+ 
+               l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
+-                                 (unsigned long) &rfc);
++                                 (unsigned long) &rfc, endptr - ptr);
+ 
+               if (test_bit(FLAG_EFS_ENABLE, &chan->flags))
+-                      l2cap_add_opt_efs(&ptr, chan);
++                      l2cap_add_opt_efs(&ptr, chan, endptr - ptr);
+ 
+               if (chan->conn->feat_mask & L2CAP_FEAT_FCS)
+                       if (chan->fcs == L2CAP_FCS_NONE ||
+                           test_bit(CONF_RECV_NO_FCS, &chan->conf_state)) {
+                               chan->fcs = L2CAP_FCS_NONE;
+                               l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1,
+-                                                 chan->fcs);
++                                                 chan->fcs, endptr - ptr);
+                       }
+               break;
+       }
+@@ -3266,10 +3270,11 @@ done:
+       return ptr - data;
+ }
+ 
+-static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data)
++static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data, size_t data_size)
+ {
+       struct l2cap_conf_rsp *rsp = data;
+       void *ptr = rsp->data;
++      void *endptr = data + data_size;
+       void *req = chan->conf_req;
+       int len = chan->conf_len;
+       int type, hint, olen;
+@@ -3371,7 +3376,7 @@ done:
+                       return -ECONNREFUSED;
+ 
+               l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
+-                                 (unsigned long) &rfc);
++                                 (unsigned long) &rfc, endptr - ptr);
+       }
+ 
+       if (result == L2CAP_CONF_SUCCESS) {
+@@ -3384,7 +3389,7 @@ done:
+                       chan->omtu = mtu;
+                       set_bit(CONF_MTU_DONE, &chan->conf_state);
+               }
+-              l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, chan->omtu);
++              l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, chan->omtu, endptr - ptr);
+ 
+               if (remote_efs) {
+                       if (chan->local_stype != L2CAP_SERV_NOTRAFIC &&
+@@ -3398,7 +3403,7 @@ done:
+ 
+                               l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS,
+                                                  sizeof(efs),
+-                                                 (unsigned long) &efs);
++                                                 (unsigned long) &efs, endptr - ptr);
+                       } else {
+                               /* Send PENDING Conf Rsp */
+                               result = L2CAP_CONF_PENDING;
+@@ -3431,7 +3436,7 @@ done:
+                       set_bit(CONF_MODE_DONE, &chan->conf_state);
+ 
+                       l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,
+-                                         sizeof(rfc), (unsigned long) &rfc);
++                                         sizeof(rfc), (unsigned long) &rfc, endptr - ptr);
+ 
+                       if (test_bit(FLAG_EFS_ENABLE, &chan->flags)) {
+                               chan->remote_id = efs.id;
+@@ -3445,7 +3450,7 @@ done:
+                                       le32_to_cpu(efs.sdu_itime);
+                               l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS,
+                                                  sizeof(efs),
+-                                                 (unsigned long) &efs);
++                                                 (unsigned long) &efs, endptr - ptr);
+                       }
+                       break;
+ 
+@@ -3459,7 +3464,7 @@ done:
+                       set_bit(CONF_MODE_DONE, &chan->conf_state);
+ 
+                       l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
+-                                         (unsigned long) &rfc);
++                                         (unsigned long) &rfc, endptr - ptr);
+ 
+                       break;
+ 
+@@ -3481,10 +3486,11 @@ done:
+ }
+ 
+ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
+-                              void *data, u16 *result)
++                              void *data, size_t size, u16 *result)
+ {
+       struct l2cap_conf_req *req = data;
+       void *ptr = req->data;
++      void *endptr = data + size;
+       int type, olen;
+       unsigned long val;
+       struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };
+@@ -3502,13 +3508,13 @@ static int l2cap_parse_conf_rsp(struct l
+                               chan->imtu = L2CAP_DEFAULT_MIN_MTU;
+                       } else
+                               chan->imtu = val;
+-                      l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, chan->imtu);
++                      l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, chan->imtu, endptr - ptr);
+                       break;
+ 
+               case L2CAP_CONF_FLUSH_TO:
+                       chan->flush_to = val;
+                       l2cap_add_conf_opt(&ptr, L2CAP_CONF_FLUSH_TO,
+-                                         2, chan->flush_to);
++                                         2, chan->flush_to, endptr - ptr);
+                       break;
+ 
+               case L2CAP_CONF_RFC:
+@@ -3522,13 +3528,13 @@ static int l2cap_parse_conf_rsp(struct l
+                       chan->fcs = 0;
+ 
+                       l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,
+-                                         sizeof(rfc), (unsigned long) &rfc);
++                                         sizeof(rfc), (unsigned long) &rfc, endptr - ptr);
+                       break;
+ 
+               case L2CAP_CONF_EWS:
+                       chan->ack_win = min_t(u16, val, chan->ack_win);
+                       l2cap_add_conf_opt(&ptr, L2CAP_CONF_EWS, 2,
+-                                         chan->tx_win);
++                                         chan->tx_win, endptr - ptr);
+                       break;
+ 
+               case L2CAP_CONF_EFS:
+@@ -3541,7 +3547,7 @@ static int l2cap_parse_conf_rsp(struct l
+                               return -ECONNREFUSED;
+ 
+                       l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS, sizeof(efs),
+-                                         (unsigned long) &efs);
++                                         (unsigned long) &efs, endptr - ptr);
+                       break;
+ 
+               case L2CAP_CONF_FCS:
+@@ -3646,7 +3652,7 @@ void __l2cap_connect_rsp_defer(struct l2
+               return;
+ 
+       l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
+-                     l2cap_build_conf_req(chan, buf), buf);
++                     l2cap_build_conf_req(chan, buf, sizeof(buf)), buf);
+       chan->num_conf_req++;
+ }
+ 
+@@ -3854,7 +3860,7 @@ sendresp:
+               u8 buf[128];
+               set_bit(CONF_REQ_SENT, &chan->conf_state);
+               l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
+-                             l2cap_build_conf_req(chan, buf), buf);
++                             l2cap_build_conf_req(chan, buf, sizeof(buf)), buf);
+               chan->num_conf_req++;
+       }
+ 
+@@ -3934,7 +3940,7 @@ static int l2cap_connect_create_rsp(stru
+                       break;
+ 
+               l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
+-                             l2cap_build_conf_req(chan, req), req);
++                             l2cap_build_conf_req(chan, req, sizeof(req)), req);
+               chan->num_conf_req++;
+               break;
+ 
+@@ -4046,7 +4052,7 @@ static inline int l2cap_config_req(struc
+       }
+ 
+       /* Complete config. */
+-      len = l2cap_parse_conf_req(chan, rsp);
++      len = l2cap_parse_conf_req(chan, rsp, sizeof(rsp));
+       if (len < 0) {
+               l2cap_send_disconn_req(chan, ECONNRESET);
+               goto unlock;
+@@ -4080,7 +4086,7 @@ static inline int l2cap_config_req(struc
+       if (!test_and_set_bit(CONF_REQ_SENT, &chan->conf_state)) {
+               u8 buf[64];
+               l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
+-                             l2cap_build_conf_req(chan, buf), buf);
++                             l2cap_build_conf_req(chan, buf, sizeof(buf)), buf);
+               chan->num_conf_req++;
+       }
+ 
+@@ -4140,7 +4146,7 @@ static inline int l2cap_config_rsp(struc
+                       char buf[64];
+ 
+                       len = l2cap_parse_conf_rsp(chan, rsp->data, len,
+-                                                 buf, &result);
++                                                 buf, sizeof(buf), &result);
+                       if (len < 0) {
+                               l2cap_send_disconn_req(chan, ECONNRESET);
+                               goto done;
+@@ -4170,7 +4176,7 @@ static inline int l2cap_config_rsp(struc
+                       /* throw out any old stored conf requests */
+                       result = L2CAP_CONF_SUCCESS;
+                       len = l2cap_parse_conf_rsp(chan, rsp->data, len,
+-                                                 req, &result);
++                                                 req, sizeof(req), &result);
+                       if (len < 0) {
+                               l2cap_send_disconn_req(chan, ECONNRESET);
+                               goto done;
+@@ -4751,7 +4757,7 @@ static void l2cap_do_create(struct l2cap
+                       set_bit(CONF_REQ_SENT, &chan->conf_state);
+                       l2cap_send_cmd(chan->conn, l2cap_get_ident(chan->conn),
+                                      L2CAP_CONF_REQ,
+-                                     l2cap_build_conf_req(chan, buf), buf);
++                                     l2cap_build_conf_req(chan, buf, sizeof(buf)), buf);
+                       chan->num_conf_req++;
+               }
+       }
+@@ -7364,7 +7370,7 @@ int l2cap_security_cfm(struct hci_conn *
+                               set_bit(CONF_REQ_SENT, &chan->conf_state);
+                               l2cap_send_cmd(conn, l2cap_get_ident(conn),
+                                              L2CAP_CONF_REQ,
+-                                             l2cap_build_conf_req(chan, buf),
++                                             l2cap_build_conf_req(chan, buf, sizeof(buf)),
+                                              buf);
+                               chan->num_conf_req++;
+                       }

diff --git a/queue-3.18/series b/queue-3.18/series
index e2ea7167d92e5d3e58ecfbb435dfd5bf4faf4720..162f61ec2d58096c15967eceb3a6c5bc5ca927ba 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -15,3 +15,5 @@ scsi-sg-recheck-mmap_io-request-length-with-lock-held.patch
 btrfs-resume-qgroup-rescan-on-rw-remount.patch
 locktorture-fix-potential-memory-leak-with-rw-lock-test.patch
 alsa-msnd-optimize-harden-dsp-and-midi-loops.patch
+bluetooth-properly-check-l2cap-config-option-output-buffer-length.patch
+arm-8692-1-mm-abort-uaccess-retries-upon-fatal-signal.patch