]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Aug 2016 14:22:51 +0000 (16:22 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Aug 2016 14:22:51 +0000 (16:22 +0200)
added patches:
i2c-mux-reg-wrong-condition-checked-for-of_address_to_resource-return-value.patch
i2c-qup-fix-wrong-value-of-index-variable.patch
intel_th-fix-a-deadlock-in-modprobing.patch
intel_th-pci-add-kaby-lake-pch-h-support.patch
libata-lite-on-cx1-jb256-hp-needs-lower-max_sectors.patch
libceph-apply-new_state-before-new_up_client-on-incrementals.patch
media-fix-airspy-usb-probe-error-path.patch
net-mvneta-set-real-interrupt-per-packet-for-tx_done.patch
posix_cpu_timer-exit-early-when-process-has-been-reaped.patch

queue-4.4/i2c-mux-reg-wrong-condition-checked-for-of_address_to_resource-return-value.patch [new file with mode: 0644]
queue-4.4/i2c-qup-fix-wrong-value-of-index-variable.patch [new file with mode: 0644]
queue-4.4/intel_th-fix-a-deadlock-in-modprobing.patch [new file with mode: 0644]
queue-4.4/intel_th-pci-add-kaby-lake-pch-h-support.patch [new file with mode: 0644]
queue-4.4/libata-lite-on-cx1-jb256-hp-needs-lower-max_sectors.patch [new file with mode: 0644]
queue-4.4/libceph-apply-new_state-before-new_up_client-on-incrementals.patch [new file with mode: 0644]
queue-4.4/media-fix-airspy-usb-probe-error-path.patch [new file with mode: 0644]
queue-4.4/net-mvneta-set-real-interrupt-per-packet-for-tx_done.patch [new file with mode: 0644]
queue-4.4/posix_cpu_timer-exit-early-when-process-has-been-reaped.patch [new file with mode: 0644]
queue-4.4/series

diff --git a/queue-4.4/i2c-mux-reg-wrong-condition-checked-for-of_address_to_resource-return-value.patch b/queue-4.4/i2c-mux-reg-wrong-condition-checked-for-of_address_to_resource-return-value.patch
new file mode 100644 (file)
index 0000000..1c12a09
--- /dev/null
@@ -0,0 +1,32 @@
+From 22ebf00eb56fe77922de8138aa9af9996582c2b3 Mon Sep 17 00:00:00 2001
+From: Lukasz Gemborowski <lukasz.gemborowski@nokia.com>
+Date: Mon, 27 Jun 2016 12:57:47 +0200
+Subject: i2c: mux: reg: wrong condition checked for of_address_to_resource return value
+
+From: Lukasz Gemborowski <lukasz.gemborowski@nokia.com>
+
+commit 22ebf00eb56fe77922de8138aa9af9996582c2b3 upstream.
+
+of_address_to_resource return 0 on successful call but
+devm_ioremap_resource is called only if it returns non-zero value
+
+Signed-off-by: Lukasz Gemborowski <lukasz.gemborowski@nokia.com>
+Reviewed-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
+Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/i2c/muxes/i2c-mux-reg.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/i2c/muxes/i2c-mux-reg.c
++++ b/drivers/i2c/muxes/i2c-mux-reg.c
+@@ -150,7 +150,7 @@ static int i2c_mux_reg_probe_dt(struct r
+               mux->data.idle_in_use = true;
+       /* map address from "reg" if exists */
+-      if (of_address_to_resource(np, 0, &res)) {
++      if (of_address_to_resource(np, 0, &res) == 0) {
+               mux->data.reg_size = resource_size(&res);
+               mux->data.reg = devm_ioremap_resource(&pdev->dev, &res);
+               if (IS_ERR(mux->data.reg))
diff --git a/queue-4.4/i2c-qup-fix-wrong-value-of-index-variable.patch b/queue-4.4/i2c-qup-fix-wrong-value-of-index-variable.patch
new file mode 100644 (file)
index 0000000..e681ee2
--- /dev/null
@@ -0,0 +1,33 @@
+From d4f56c7773483b8829e89cfc739b7a5a071f6da0 Mon Sep 17 00:00:00 2001
+From: Sricharan R <sricharan@codeaurora.org>
+Date: Fri, 10 Jun 2016 23:38:20 +0530
+Subject: i2c: qup: Fix wrong value of index variable
+
+From: Sricharan R <sricharan@codeaurora.org>
+
+commit d4f56c7773483b8829e89cfc739b7a5a071f6da0 upstream.
+
+index gets incremented during check to determine if the
+messages can be transferred with dma. But not reset after
+that, resulting in wrong start value in subsequent loop,
+causing failure. Fix it.
+
+Signed-off-by: Sricharan R <sricharan@codeaurora.org>
+Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/i2c/busses/i2c-qup.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/i2c/busses/i2c-qup.c
++++ b/drivers/i2c/busses/i2c-qup.c
+@@ -435,6 +435,8 @@ static int qup_i2c_read_one(struct qup_i
+       if (ret)
+               goto err;
++      idx = 0;
++
+       do {
+               left = wait_for_completion_timeout(&qup->xfer, HZ);
+               if (!left) {
diff --git a/queue-4.4/intel_th-fix-a-deadlock-in-modprobing.patch b/queue-4.4/intel_th-fix-a-deadlock-in-modprobing.patch
new file mode 100644 (file)
index 0000000..1bedd5d
--- /dev/null
@@ -0,0 +1,93 @@
+From a36aa80f3cb2540fb1dbad6240852de4365a2e82 Mon Sep 17 00:00:00 2001
+From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Date: Thu, 30 Jun 2016 11:51:44 +0300
+Subject: intel_th: Fix a deadlock in modprobing
+
+From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+
+commit a36aa80f3cb2540fb1dbad6240852de4365a2e82 upstream.
+
+Driver initialization tries to request a hub (GTH) driver module from
+its probe callback, resulting in a deadlock.
+
+This patch solves the problem by adding a deferred work for requesting
+the hub module.
+
+Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hwtracing/intel_th/core.c     |   35 +++++++++++++++++++++++++++++++++-
+ drivers/hwtracing/intel_th/intel_th.h |    3 ++
+ 2 files changed, 37 insertions(+), 1 deletion(-)
+
+--- a/drivers/hwtracing/intel_th/core.c
++++ b/drivers/hwtracing/intel_th/core.c
+@@ -419,6 +419,38 @@ static struct intel_th_subdevice {
+       },
+ };
++#ifdef CONFIG_MODULES
++static void __intel_th_request_hub_module(struct work_struct *work)
++{
++      struct intel_th *th = container_of(work, struct intel_th,
++                                         request_module_work);
++
++      request_module("intel_th_%s", th->hub->name);
++}
++
++static int intel_th_request_hub_module(struct intel_th *th)
++{
++      INIT_WORK(&th->request_module_work, __intel_th_request_hub_module);
++      schedule_work(&th->request_module_work);
++
++      return 0;
++}
++
++static void intel_th_request_hub_module_flush(struct intel_th *th)
++{
++      flush_work(&th->request_module_work);
++}
++#else
++static inline int intel_th_request_hub_module(struct intel_th *th)
++{
++      return -EINVAL;
++}
++
++static inline void intel_th_request_hub_module_flush(struct intel_th *th)
++{
++}
++#endif /* CONFIG_MODULES */
++
+ static int intel_th_populate(struct intel_th *th, struct resource *devres,
+                            unsigned int ndevres, int irq)
+ {
+@@ -488,7 +520,7 @@ static int intel_th_populate(struct inte
+               /* need switch driver to be loaded to enumerate the rest */
+               if (subdev->type == INTEL_TH_SWITCH && !req) {
+                       th->hub = thdev;
+-                      err = request_module("intel_th_%s", subdev->name);
++                      err = intel_th_request_hub_module(th);
+                       if (!err)
+                               req++;
+               }
+@@ -603,6 +635,7 @@ void intel_th_free(struct intel_th *th)
+ {
+       int i;
++      intel_th_request_hub_module_flush(th);
+       for (i = 0; i < TH_SUBDEVICE_MAX; i++)
+               if (th->thdev[i] != th->hub)
+                       intel_th_device_remove(th->thdev[i]);
+--- a/drivers/hwtracing/intel_th/intel_th.h
++++ b/drivers/hwtracing/intel_th/intel_th.h
+@@ -197,6 +197,9 @@ struct intel_th {
+       int                     id;
+       int                     major;
++#ifdef CONFIG_MODULES
++      struct work_struct      request_module_work;
++#endif /* CONFIG_MODULES */
+ #ifdef CONFIG_INTEL_TH_DEBUG
+       struct dentry           *dbg;
+ #endif
diff --git a/queue-4.4/intel_th-pci-add-kaby-lake-pch-h-support.patch b/queue-4.4/intel_th-pci-add-kaby-lake-pch-h-support.patch
new file mode 100644 (file)
index 0000000..6b82cd3
--- /dev/null
@@ -0,0 +1,32 @@
+From 7a1a47ce35821b40f5b2ce46379ba14393bc3873 Mon Sep 17 00:00:00 2001
+From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Date: Tue, 28 Jun 2016 18:55:23 +0300
+Subject: intel_th: pci: Add Kaby Lake PCH-H support
+
+From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+
+commit 7a1a47ce35821b40f5b2ce46379ba14393bc3873 upstream.
+
+This adds Intel(R) Trace Hub PCI ID for Kaby Lake PCH-H.
+
+Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hwtracing/intel_th/pci.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/hwtracing/intel_th/pci.c
++++ b/drivers/hwtracing/intel_th/pci.c
+@@ -67,6 +67,11 @@ static const struct pci_device_id intel_
+               PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa126),
+               .driver_data = (kernel_ulong_t)0,
+       },
++      {
++              /* Kaby Lake PCH-H */
++              PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa2a6),
++              .driver_data = (kernel_ulong_t)0,
++      },
+       { 0 },
+ };
diff --git a/queue-4.4/libata-lite-on-cx1-jb256-hp-needs-lower-max_sectors.patch b/queue-4.4/libata-lite-on-cx1-jb256-hp-needs-lower-max_sectors.patch
new file mode 100644 (file)
index 0000000..6b67010
--- /dev/null
@@ -0,0 +1,40 @@
+From 1488a1e3828d60d74c9b802a05e24c0487babe4e Mon Sep 17 00:00:00 2001
+From: Tejun Heo <tj@kernel.org>
+Date: Mon, 18 Jul 2016 18:40:00 -0400
+Subject: libata: LITE-ON CX1-JB256-HP needs lower max_sectors
+
+From: Tejun Heo <tj@kernel.org>
+
+commit 1488a1e3828d60d74c9b802a05e24c0487babe4e upstream.
+
+Since 34b48db66e08 ("block: remove artifical max_hw_sectors cap"),
+max_sectors is no longer limited to BLK_DEF_MAX_SECTORS and LITE-ON
+CX1-JB256-HP keeps timing out with higher max_sectors.  Revert it to
+the previous value.
+
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Reported-by: dgerasimov@gmail.com
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=121671
+Fixes: 34b48db66e08 ("block: remove artifical max_hw_sectors cap")
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/libata-core.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -4138,6 +4138,12 @@ static const struct ata_blacklist_entry
+        */
+       { "ST380013AS",         "3.20",         ATA_HORKAGE_MAX_SEC_1024 },
++      /*
++       * Device times out with higher max sects.
++       * https://bugzilla.kernel.org/show_bug.cgi?id=121671
++       */
++      { "LITEON CX1-JB256-HP", NULL,          ATA_HORKAGE_MAX_SEC_1024 },
++
+       /* Devices we expect to fail diagnostics */
+       /* Devices where NCQ should be avoided */
diff --git a/queue-4.4/libceph-apply-new_state-before-new_up_client-on-incrementals.patch b/queue-4.4/libceph-apply-new_state-before-new_up_client-on-incrementals.patch
new file mode 100644 (file)
index 0000000..bc77522
--- /dev/null
@@ -0,0 +1,227 @@
+From 930c532869774ebf8af9efe9484c597f896a7d46 Mon Sep 17 00:00:00 2001
+From: Ilya Dryomov <idryomov@gmail.com>
+Date: Tue, 19 Jul 2016 03:50:28 +0200
+Subject: libceph: apply new_state before new_up_client on incrementals
+
+From: Ilya Dryomov <idryomov@gmail.com>
+
+commit 930c532869774ebf8af9efe9484c597f896a7d46 upstream.
+
+Currently, osd_weight and osd_state fields are updated in the encoding
+order.  This is wrong, because an incremental map may look like e.g.
+
+    new_up_client: { osd=6, addr=... } # set osd_state and addr
+    new_state: { osd=6, xorstate=EXISTS } # clear osd_state
+
+Suppose osd6's current osd_state is EXISTS (i.e. osd6 is down).  After
+applying new_up_client, osd_state is changed to EXISTS | UP.  Carrying
+on with the new_state update, we flip EXISTS and leave osd6 in a weird
+"!EXISTS but UP" state.  A non-existent OSD is considered down by the
+mapping code
+
+2087    for (i = 0; i < pg->pg_temp.len; i++) {
+2088            if (ceph_osd_is_down(osdmap, pg->pg_temp.osds[i])) {
+2089                    if (ceph_can_shift_osds(pi))
+2090                            continue;
+2091
+2092                    temp->osds[temp->size++] = CRUSH_ITEM_NONE;
+
+and so requests get directed to the second OSD in the set instead of
+the first, resulting in OSD-side errors like:
+
+[WRN] : client.4239 192.168.122.21:0/2444980242 misdirected client.4239.1:2827 pg 2.5df899f2 to osd.4 not [1,4,6] in e680/680
+
+and hung rbds on the client:
+
+[  493.566367] rbd: rbd0: write 400000 at 11cc00000 (0)
+[  493.566805] rbd: rbd0:   result -6 xferred 400000
+[  493.567011] blk_update_request: I/O error, dev rbd0, sector 9330688
+
+The fix is to decouple application from the decoding and:
+- apply new_weight first
+- apply new_state before new_up_client
+- twiddle osd_state flags if marking in
+- clear out some of the state if osd is destroyed
+
+Fixes: http://tracker.ceph.com/issues/14901
+
+Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
+Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/ceph/osdmap.c |  156 +++++++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 113 insertions(+), 43 deletions(-)
+
+--- a/net/ceph/osdmap.c
++++ b/net/ceph/osdmap.c
+@@ -1192,6 +1192,115 @@ struct ceph_osdmap *ceph_osdmap_decode(v
+ }
+ /*
++ * Encoding order is (new_up_client, new_state, new_weight).  Need to
++ * apply in the (new_weight, new_state, new_up_client) order, because
++ * an incremental map may look like e.g.
++ *
++ *     new_up_client: { osd=6, addr=... } # set osd_state and addr
++ *     new_state: { osd=6, xorstate=EXISTS } # clear osd_state
++ */
++static int decode_new_up_state_weight(void **p, void *end,
++                                    struct ceph_osdmap *map)
++{
++      void *new_up_client;
++      void *new_state;
++      void *new_weight_end;
++      u32 len;
++
++      new_up_client = *p;
++      ceph_decode_32_safe(p, end, len, e_inval);
++      len *= sizeof(u32) + sizeof(struct ceph_entity_addr);
++      ceph_decode_need(p, end, len, e_inval);
++      *p += len;
++
++      new_state = *p;
++      ceph_decode_32_safe(p, end, len, e_inval);
++      len *= sizeof(u32) + sizeof(u8);
++      ceph_decode_need(p, end, len, e_inval);
++      *p += len;
++
++      /* new_weight */
++      ceph_decode_32_safe(p, end, len, e_inval);
++      while (len--) {
++              s32 osd;
++              u32 w;
++
++              ceph_decode_need(p, end, 2*sizeof(u32), e_inval);
++              osd = ceph_decode_32(p);
++              w = ceph_decode_32(p);
++              BUG_ON(osd >= map->max_osd);
++              pr_info("osd%d weight 0x%x %s\n", osd, w,
++                   w == CEPH_OSD_IN ? "(in)" :
++                   (w == CEPH_OSD_OUT ? "(out)" : ""));
++              map->osd_weight[osd] = w;
++
++              /*
++               * If we are marking in, set the EXISTS, and clear the
++               * AUTOOUT and NEW bits.
++               */
++              if (w) {
++                      map->osd_state[osd] |= CEPH_OSD_EXISTS;
++                      map->osd_state[osd] &= ~(CEPH_OSD_AUTOOUT |
++                                               CEPH_OSD_NEW);
++              }
++      }
++      new_weight_end = *p;
++
++      /* new_state (up/down) */
++      *p = new_state;
++      len = ceph_decode_32(p);
++      while (len--) {
++              s32 osd;
++              u8 xorstate;
++              int ret;
++
++              osd = ceph_decode_32(p);
++              xorstate = ceph_decode_8(p);
++              if (xorstate == 0)
++                      xorstate = CEPH_OSD_UP;
++              BUG_ON(osd >= map->max_osd);
++              if ((map->osd_state[osd] & CEPH_OSD_UP) &&
++                  (xorstate & CEPH_OSD_UP))
++                      pr_info("osd%d down\n", osd);
++              if ((map->osd_state[osd] & CEPH_OSD_EXISTS) &&
++                  (xorstate & CEPH_OSD_EXISTS)) {
++                      pr_info("osd%d does not exist\n", osd);
++                      map->osd_weight[osd] = CEPH_OSD_IN;
++                      ret = set_primary_affinity(map, osd,
++                                                 CEPH_OSD_DEFAULT_PRIMARY_AFFINITY);
++                      if (ret)
++                              return ret;
++                      memset(map->osd_addr + osd, 0, sizeof(*map->osd_addr));
++                      map->osd_state[osd] = 0;
++              } else {
++                      map->osd_state[osd] ^= xorstate;
++              }
++      }
++
++      /* new_up_client */
++      *p = new_up_client;
++      len = ceph_decode_32(p);
++      while (len--) {
++              s32 osd;
++              struct ceph_entity_addr addr;
++
++              osd = ceph_decode_32(p);
++              ceph_decode_copy(p, &addr, sizeof(addr));
++              ceph_decode_addr(&addr);
++              BUG_ON(osd >= map->max_osd);
++              pr_info("osd%d up\n", osd);
++              map->osd_state[osd] |= CEPH_OSD_EXISTS | CEPH_OSD_UP;
++              map->osd_addr[osd] = addr;
++      }
++
++      *p = new_weight_end;
++      return 0;
++
++e_inval:
++      return -EINVAL;
++}
++
++/*
+  * decode and apply an incremental map update.
+  */
+ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
+@@ -1290,49 +1399,10 @@ struct ceph_osdmap *osdmap_apply_increme
+                       __remove_pg_pool(&map->pg_pools, pi);
+       }
+-      /* new_up */
+-      ceph_decode_32_safe(p, end, len, e_inval);
+-      while (len--) {
+-              u32 osd;
+-              struct ceph_entity_addr addr;
+-              ceph_decode_32_safe(p, end, osd, e_inval);
+-              ceph_decode_copy_safe(p, end, &addr, sizeof(addr), e_inval);
+-              ceph_decode_addr(&addr);
+-              pr_info("osd%d up\n", osd);
+-              BUG_ON(osd >= map->max_osd);
+-              map->osd_state[osd] |= CEPH_OSD_UP | CEPH_OSD_EXISTS;
+-              map->osd_addr[osd] = addr;
+-      }
+-
+-      /* new_state */
+-      ceph_decode_32_safe(p, end, len, e_inval);
+-      while (len--) {
+-              u32 osd;
+-              u8 xorstate;
+-              ceph_decode_32_safe(p, end, osd, e_inval);
+-              xorstate = **(u8 **)p;
+-              (*p)++;  /* clean flag */
+-              if (xorstate == 0)
+-                      xorstate = CEPH_OSD_UP;
+-              if (xorstate & CEPH_OSD_UP)
+-                      pr_info("osd%d down\n", osd);
+-              if (osd < map->max_osd)
+-                      map->osd_state[osd] ^= xorstate;
+-      }
+-
+-      /* new_weight */
+-      ceph_decode_32_safe(p, end, len, e_inval);
+-      while (len--) {
+-              u32 osd, off;
+-              ceph_decode_need(p, end, sizeof(u32)*2, e_inval);
+-              osd = ceph_decode_32(p);
+-              off = ceph_decode_32(p);
+-              pr_info("osd%d weight 0x%x %s\n", osd, off,
+-                   off == CEPH_OSD_IN ? "(in)" :
+-                   (off == CEPH_OSD_OUT ? "(out)" : ""));
+-              if (osd < map->max_osd)
+-                      map->osd_weight[osd] = off;
+-      }
++      /* new_up_client, new_state, new_weight */
++      err = decode_new_up_state_weight(p, end, map);
++      if (err)
++              goto bad;
+       /* new_pg_temp */
+       err = decode_new_pg_temp(p, end, map);
diff --git a/queue-4.4/media-fix-airspy-usb-probe-error-path.patch b/queue-4.4/media-fix-airspy-usb-probe-error-path.patch
new file mode 100644 (file)
index 0000000..52449a6
--- /dev/null
@@ -0,0 +1,53 @@
+From aa93d1fee85c890a34f2510a310e55ee76a27848 Mon Sep 17 00:00:00 2001
+From: James Patrick-Evans <james@jmp-e.com>
+Date: Fri, 15 Jul 2016 16:40:45 +0100
+Subject: media: fix airspy usb probe error path
+
+From: James Patrick-Evans <james@jmp-e.com>
+
+commit aa93d1fee85c890a34f2510a310e55ee76a27848 upstream.
+
+Fix a memory leak on probe error of the airspy usb device driver.
+
+The problem is triggered when more than 64 usb devices register with
+v4l2 of type VFL_TYPE_SDR or VFL_TYPE_SUBDEV.
+
+The memory leak is caused by the probe function of the airspy driver
+mishandeling errors and not freeing the corresponding control structures
+when an error occours registering the device to v4l2 core.
+
+A badusb device can emulate 64 of these devices, and then through
+continual emulated connect/disconnect of the 65th device, cause the
+kernel to run out of RAM and crash the kernel, thus causing a local DOS
+vulnerability.
+
+Fixes CVE-2016-5400
+
+Signed-off-by: James Patrick-Evans <james@jmp-e.com>
+Reviewed-by: Kees Cook <keescook@chromium.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/usb/airspy/airspy.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/media/usb/airspy/airspy.c
++++ b/drivers/media/usb/airspy/airspy.c
+@@ -1073,7 +1073,7 @@ static int airspy_probe(struct usb_inter
+       if (ret) {
+               dev_err(s->dev, "Failed to register as video device (%d)\n",
+                               ret);
+-              goto err_unregister_v4l2_dev;
++              goto err_free_controls;
+       }
+       dev_info(s->dev, "Registered as %s\n",
+                       video_device_node_name(&s->vdev));
+@@ -1082,7 +1082,6 @@ static int airspy_probe(struct usb_inter
+ err_free_controls:
+       v4l2_ctrl_handler_free(&s->hdl);
+-err_unregister_v4l2_dev:
+       v4l2_device_unregister(&s->v4l2_dev);
+ err_free_mem:
+       kfree(s);
diff --git a/queue-4.4/net-mvneta-set-real-interrupt-per-packet-for-tx_done.patch b/queue-4.4/net-mvneta-set-real-interrupt-per-packet-for-tx_done.patch
new file mode 100644 (file)
index 0000000..8877e12
--- /dev/null
@@ -0,0 +1,47 @@
+From 06708f81528725148473c0869d6af5f809c6824b Mon Sep 17 00:00:00 2001
+From: Dmitri Epshtein <dima@marvell.com>
+Date: Wed, 6 Jul 2016 04:18:58 +0200
+Subject: net: mvneta: set real interrupt per packet for tx_done
+
+From: Dmitri Epshtein <dima@marvell.com>
+
+commit 06708f81528725148473c0869d6af5f809c6824b upstream.
+
+Commit aebea2ba0f74 ("net: mvneta: fix Tx interrupt delay") intended to
+set coalescing threshold to a value guaranteeing interrupt generation
+per each sent packet, so that buffers can be released with no delay.
+
+In fact setting threshold to '1' was wrong, because it causes interrupt
+every two packets. According to the documentation a reason behind it is
+following - interrupt occurs once sent buffers counter reaches a value,
+which is higher than one specified in MVNETA_TXQ_SIZE_REG(q). This
+behavior was confirmed during tests. Also when testing the SoC working
+as a NAS device, better performance was observed with int-per-packet,
+as it strongly depends on the fact that all transmitted packets are
+released immediately.
+
+This commit enables NETA controller work in interrupt per sent packet mode
+by setting coalescing threshold to 0.
+
+Signed-off-by: Dmitri Epshtein <dima@marvell.com>
+Signed-off-by: Marcin Wojtas <mw@semihalf.com>
+Fixes aebea2ba0f74 ("net: mvneta: fix Tx interrupt delay")
+Acked-by: Willy Tarreau <w@1wt.eu>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/marvell/mvneta.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/marvell/mvneta.c
++++ b/drivers/net/ethernet/marvell/mvneta.c
+@@ -226,7 +226,7 @@
+ /* Various constants */
+ /* Coalescing */
+-#define MVNETA_TXDONE_COAL_PKTS               1
++#define MVNETA_TXDONE_COAL_PKTS               0       /* interrupt per packet */
+ #define MVNETA_RX_COAL_PKTS           32
+ #define MVNETA_RX_COAL_USEC           100
diff --git a/queue-4.4/posix_cpu_timer-exit-early-when-process-has-been-reaped.patch b/queue-4.4/posix_cpu_timer-exit-early-when-process-has-been-reaped.patch
new file mode 100644 (file)
index 0000000..b3351f2
--- /dev/null
@@ -0,0 +1,41 @@
+From 2c13ce8f6b2f6fd9ba2f9261b1939fc0f62d1307 Mon Sep 17 00:00:00 2001
+From: Alexey Dobriyan <adobriyan@gmail.com>
+Date: Fri, 8 Jul 2016 01:39:11 +0300
+Subject: posix_cpu_timer: Exit early when process has been reaped
+
+From: Alexey Dobriyan <adobriyan@gmail.com>
+
+commit 2c13ce8f6b2f6fd9ba2f9261b1939fc0f62d1307 upstream.
+
+Variable "now" seems to be genuinely used unintialized
+if branch
+
+       if (CPUCLOCK_PERTHREAD(timer->it_clock)) {
+
+is not taken and branch
+
+       if (unlikely(sighand == NULL)) {
+
+is taken. In this case the process has been reaped and the timer is marked as
+disarmed anyway. So none of the postprocessing of the sample is
+required. Return right away.
+
+Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
+Link: http://lkml.kernel.org/r/20160707223911.GA26483@p183.telecom.by
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/time/posix-cpu-timers.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/kernel/time/posix-cpu-timers.c
++++ b/kernel/time/posix-cpu-timers.c
+@@ -808,6 +808,7 @@ static void posix_cpu_timer_get(struct k
+                       timer->it.cpu.expires = 0;
+                       sample_to_timespec(timer->it_clock, timer->it.cpu.expires,
+                                          &itp->it_value);
++                      return;
+               } else {
+                       cpu_timer_sample_group(timer->it_clock, p, &now);
+                       unlock_task_sighand(p, &flags);
index bbc23f640a0c46574c5a6a7818e1be5919b8c30f..5c56c1fb2a423893e4dbfc1b6b855fbb9dbd0067 100644 (file)
@@ -56,3 +56,12 @@ can-fix-oops-caused-by-wrong-rtnl-dellink-usage.patch
 rds-fix-rds_tcp_init-error-path.patch
 scsi-fix-new-bug-in-scsi_dev_info_list-string-matching.patch
 ipr-clear-interrupt-on-croc-crocodile-when-running-with-lsi.patch
+media-fix-airspy-usb-probe-error-path.patch
+posix_cpu_timer-exit-early-when-process-has-been-reaped.patch
+i2c-qup-fix-wrong-value-of-index-variable.patch
+i2c-mux-reg-wrong-condition-checked-for-of_address_to_resource-return-value.patch
+libata-lite-on-cx1-jb256-hp-needs-lower-max_sectors.patch
+libceph-apply-new_state-before-new_up_client-on-incrementals.patch
+net-mvneta-set-real-interrupt-per-packet-for-tx_done.patch
+intel_th-pci-add-kaby-lake-pch-h-support.patch
+intel_th-fix-a-deadlock-in-modprobing.patch