]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Oct 2018 12:03:15 +0000 (05:03 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Oct 2018 12:03:15 +0000 (05:03 -0700)
added patches:
arm64-kvm-tighten-guest-core-register-access-from-userspace.patch
e1000-check-on-netif_running-before-calling-e1000_up.patch
e1000-ensure-to-free-old-tx-rx-rings-in-set_ringparam.patch
ext4-never-move-the-system.data-xattr-out-of-the-inode-body.patch
hwmon-adt7475-make-adt7475_read_word-return-errors.patch
hwmon-ina2xx-fix-sysfs-shunt-resistor-read-access.patch
i2c-i801-allow-acpi-aml-access-i-o-ports-not-reserved-for-smbus.patch
net-hns-fix-length-and-page_offset-overflow-when-config_arm64_64k_pages.patch
serial-imx-restore-handshaking-irq-for-imx1.patch
thermal-of-thermal-disable-passive-polling-when-thermal-zone-is-disabled.patch

queue-4.4/arm64-kvm-tighten-guest-core-register-access-from-userspace.patch [new file with mode: 0644]
queue-4.4/e1000-check-on-netif_running-before-calling-e1000_up.patch [new file with mode: 0644]
queue-4.4/e1000-ensure-to-free-old-tx-rx-rings-in-set_ringparam.patch [new file with mode: 0644]
queue-4.4/ext4-never-move-the-system.data-xattr-out-of-the-inode-body.patch [new file with mode: 0644]
queue-4.4/hwmon-adt7475-make-adt7475_read_word-return-errors.patch [new file with mode: 0644]
queue-4.4/hwmon-ina2xx-fix-sysfs-shunt-resistor-read-access.patch [new file with mode: 0644]
queue-4.4/i2c-i801-allow-acpi-aml-access-i-o-ports-not-reserved-for-smbus.patch [new file with mode: 0644]
queue-4.4/net-hns-fix-length-and-page_offset-overflow-when-config_arm64_64k_pages.patch [new file with mode: 0644]
queue-4.4/serial-imx-restore-handshaking-irq-for-imx1.patch [new file with mode: 0644]
queue-4.4/series
queue-4.4/thermal-of-thermal-disable-passive-polling-when-thermal-zone-is-disabled.patch [new file with mode: 0644]

diff --git a/queue-4.4/arm64-kvm-tighten-guest-core-register-access-from-userspace.patch b/queue-4.4/arm64-kvm-tighten-guest-core-register-access-from-userspace.patch
new file mode 100644 (file)
index 0000000..fe894f4
--- /dev/null
@@ -0,0 +1,99 @@
+From d26c25a9d19b5976b319af528886f89cf455692d Mon Sep 17 00:00:00 2001
+From: Dave Martin <Dave.Martin@arm.com>
+Date: Thu, 27 Sep 2018 16:53:21 +0100
+Subject: arm64: KVM: Tighten guest core register access from userspace
+
+From: Dave Martin <Dave.Martin@arm.com>
+
+commit d26c25a9d19b5976b319af528886f89cf455692d upstream.
+
+We currently allow userspace to access the core register file
+in about any possible way, including straddling multiple
+registers and doing unaligned accesses.
+
+This is not the expected use of the ABI, and nobody is actually
+using it that way. Let's tighten it by explicitly checking
+the size and alignment for each field of the register file.
+
+Cc: <stable@vger.kernel.org>
+Fixes: 2f4a07c5f9fe ("arm64: KVM: guest one-reg interface")
+Reviewed-by: Christoffer Dall <christoffer.dall@arm.com>
+Reviewed-by: Mark Rutland <mark.rutland@arm.com>
+Signed-off-by: Dave Martin <Dave.Martin@arm.com>
+[maz: rewrote Dave's initial patch to be more easily backported]
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/kvm/guest.c |   45 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 45 insertions(+)
+
+--- a/arch/arm64/kvm/guest.c
++++ b/arch/arm64/kvm/guest.c
+@@ -48,6 +48,45 @@ static u64 core_reg_offset_from_id(u64 i
+       return id & ~(KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK | KVM_REG_ARM_CORE);
+ }
++static int validate_core_offset(const struct kvm_one_reg *reg)
++{
++      u64 off = core_reg_offset_from_id(reg->id);
++      int size;
++
++      switch (off) {
++      case KVM_REG_ARM_CORE_REG(regs.regs[0]) ...
++           KVM_REG_ARM_CORE_REG(regs.regs[30]):
++      case KVM_REG_ARM_CORE_REG(regs.sp):
++      case KVM_REG_ARM_CORE_REG(regs.pc):
++      case KVM_REG_ARM_CORE_REG(regs.pstate):
++      case KVM_REG_ARM_CORE_REG(sp_el1):
++      case KVM_REG_ARM_CORE_REG(elr_el1):
++      case KVM_REG_ARM_CORE_REG(spsr[0]) ...
++           KVM_REG_ARM_CORE_REG(spsr[KVM_NR_SPSR - 1]):
++              size = sizeof(__u64);
++              break;
++
++      case KVM_REG_ARM_CORE_REG(fp_regs.vregs[0]) ...
++           KVM_REG_ARM_CORE_REG(fp_regs.vregs[31]):
++              size = sizeof(__uint128_t);
++              break;
++
++      case KVM_REG_ARM_CORE_REG(fp_regs.fpsr):
++      case KVM_REG_ARM_CORE_REG(fp_regs.fpcr):
++              size = sizeof(__u32);
++              break;
++
++      default:
++              return -EINVAL;
++      }
++
++      if (KVM_REG_SIZE(reg->id) == size &&
++          IS_ALIGNED(off, size / sizeof(__u32)))
++              return 0;
++
++      return -EINVAL;
++}
++
+ static int get_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
+ {
+       /*
+@@ -67,6 +106,9 @@ static int get_core_reg(struct kvm_vcpu
+           (off + (KVM_REG_SIZE(reg->id) / sizeof(__u32))) >= nr_regs)
+               return -ENOENT;
++      if (validate_core_offset(reg))
++              return -EINVAL;
++
+       if (copy_to_user(uaddr, ((u32 *)regs) + off, KVM_REG_SIZE(reg->id)))
+               return -EFAULT;
+@@ -89,6 +131,9 @@ static int set_core_reg(struct kvm_vcpu
+           (off + (KVM_REG_SIZE(reg->id) / sizeof(__u32))) >= nr_regs)
+               return -ENOENT;
++      if (validate_core_offset(reg))
++              return -EINVAL;
++
+       if (KVM_REG_SIZE(reg->id) > sizeof(tmp))
+               return -EINVAL;
diff --git a/queue-4.4/e1000-check-on-netif_running-before-calling-e1000_up.patch b/queue-4.4/e1000-check-on-netif_running-before-calling-e1000_up.patch
new file mode 100644 (file)
index 0000000..59a0d8d
--- /dev/null
@@ -0,0 +1,42 @@
+From foo@baz Tue Oct  2 05:03:08 PDT 2018
+From: Bo Chen <chenbo@pdx.edu>
+Date: Mon, 23 Jul 2018 09:01:29 -0700
+Subject: e1000: check on netif_running() before calling e1000_up()
+
+From: Bo Chen <chenbo@pdx.edu>
+
+[ Upstream commit cf1acec008f8d7761aa3fd7c4bca7e17b2d2512d ]
+
+When the device is not up, the call to 'e1000_up()' from the error handling path
+of 'e1000_set_ringparam()' causes a kernel oops with a null-pointer
+dereference. The null-pointer dereference is triggered in function
+'e1000_alloc_rx_buffers()' at line 'buffer_info = &rx_ring->buffer_info[i]'.
+
+This bug was reported by COD, a tool for testing kernel module binaries I am
+building. This bug was also detected by KFI from Dr. Kai Cong.
+
+This patch fixes the bug by checking on 'netif_running()' before calling
+'e1000_up()' in 'e1000_set_ringparam()'.
+
+Signed-off-by: Bo Chen <chenbo@pdx.edu>
+Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
+Tested-by: Aaron Brown <aaron.f.brown@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
++++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+@@ -665,7 +665,8 @@ err_setup_rx:
+ err_alloc_rx:
+       kfree(txdr);
+ err_alloc_tx:
+-      e1000_up(adapter);
++      if (netif_running(adapter->netdev))
++              e1000_up(adapter);
+ err_setup:
+       clear_bit(__E1000_RESETTING, &adapter->flags);
+       return err;
diff --git a/queue-4.4/e1000-ensure-to-free-old-tx-rx-rings-in-set_ringparam.patch b/queue-4.4/e1000-ensure-to-free-old-tx-rx-rings-in-set_ringparam.patch
new file mode 100644 (file)
index 0000000..66cf2aa
--- /dev/null
@@ -0,0 +1,46 @@
+From foo@baz Tue Oct  2 05:03:08 PDT 2018
+From: Bo Chen <chenbo@pdx.edu>
+Date: Mon, 23 Jul 2018 09:01:30 -0700
+Subject: e1000: ensure to free old tx/rx rings in set_ringparam()
+
+From: Bo Chen <chenbo@pdx.edu>
+
+[ Upstream commit ee400a3f1bfe7004a3e14b81c38ccc5583c26295 ]
+
+In 'e1000_set_ringparam()', the tx_ring and rx_ring are updated with new value
+and the old tx/rx rings are freed only when the device is up. There are resource
+leaks on old tx/rx rings when the device is not up. This bug is reported by COD,
+a tool for testing kernel module binaries I am building.
+
+This patch fixes the bug by always calling 'kfree()' on old tx/rx rings in
+'e1000_set_ringparam()'.
+
+Signed-off-by: Bo Chen <chenbo@pdx.edu>
+Reviewed-by: Alexander Duyck <alexander.h.duyck@intel.com>
+Tested-by: Aaron Brown <aaron.f.brown@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
++++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+@@ -645,14 +645,14 @@ static int e1000_set_ringparam(struct ne
+               adapter->tx_ring = tx_old;
+               e1000_free_all_rx_resources(adapter);
+               e1000_free_all_tx_resources(adapter);
+-              kfree(tx_old);
+-              kfree(rx_old);
+               adapter->rx_ring = rxdr;
+               adapter->tx_ring = txdr;
+               err = e1000_up(adapter);
+               if (err)
+                       goto err_setup;
+       }
++      kfree(tx_old);
++      kfree(rx_old);
+       clear_bit(__E1000_RESETTING, &adapter->flags);
+       return 0;
diff --git a/queue-4.4/ext4-never-move-the-system.data-xattr-out-of-the-inode-body.patch b/queue-4.4/ext4-never-move-the-system.data-xattr-out-of-the-inode-body.patch
new file mode 100644 (file)
index 0000000..fef81a5
--- /dev/null
@@ -0,0 +1,40 @@
+From 8cdb5240ec5928b20490a2bb34cb87e9a5f40226 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Sat, 16 Jun 2018 15:40:48 -0400
+Subject: ext4: never move the system.data xattr out of the inode body
+
+From: Theodore Ts'o <tytso@mit.edu>
+
+commit 8cdb5240ec5928b20490a2bb34cb87e9a5f40226 upstream.
+
+When expanding the extra isize space, we must never move the
+system.data xattr out of the inode body.  For performance reasons, it
+doesn't make any sense, and the inline data implementation assumes
+that system.data xattr is never in the external xattr block.
+
+This addresses CVE-2018-10880
+
+https://bugzilla.kernel.org/show_bug.cgi?id=200005
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Cc: stable@kernel.org
+Signed-off-by: Zubin Mithra <zsm@chromium.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/ext4/xattr.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/fs/ext4/xattr.c
++++ b/fs/ext4/xattr.c
+@@ -1386,6 +1386,11 @@ retry:
+               /* Find the entry best suited to be pushed into EA block */
+               entry = NULL;
+               for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {
++                      /* never move system.data out of the inode */
++                      if ((last->e_name_len == 4) &&
++                          (last->e_name_index == EXT4_XATTR_INDEX_SYSTEM) &&
++                          !memcmp(last->e_name, "data", 4))
++                              continue;
+                       total_size =
+                       EXT4_XATTR_SIZE(le32_to_cpu(last->e_value_size)) +
+                                       EXT4_XATTR_LEN(last->e_name_len);
diff --git a/queue-4.4/hwmon-adt7475-make-adt7475_read_word-return-errors.patch b/queue-4.4/hwmon-adt7475-make-adt7475_read_word-return-errors.patch
new file mode 100644 (file)
index 0000000..dd031a6
--- /dev/null
@@ -0,0 +1,47 @@
+From foo@baz Tue Oct  2 05:03:08 PDT 2018
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Tue, 14 Aug 2018 13:07:47 +0300
+Subject: hwmon: (adt7475) Make adt7475_read_word() return errors
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+[ Upstream commit f196dec6d50abb2e65fb54a0621b2f1b4d922995 ]
+
+The adt7475_read_word() function was meant to return negative error
+codes on failure.
+
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Reviewed-by: Tokunori Ikegami <ikegami@allied-telesis.co.jp>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/hwmon/adt7475.c |   14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+--- a/drivers/hwmon/adt7475.c
++++ b/drivers/hwmon/adt7475.c
+@@ -274,14 +274,18 @@ static inline u16 volt2reg(int channel,
+       return clamp_val(reg, 0, 1023) & (0xff << 2);
+ }
+-static u16 adt7475_read_word(struct i2c_client *client, int reg)
++static int adt7475_read_word(struct i2c_client *client, int reg)
+ {
+-      u16 val;
++      int val1, val2;
+-      val = i2c_smbus_read_byte_data(client, reg);
+-      val |= (i2c_smbus_read_byte_data(client, reg + 1) << 8);
++      val1 = i2c_smbus_read_byte_data(client, reg);
++      if (val1 < 0)
++              return val1;
++      val2 = i2c_smbus_read_byte_data(client, reg + 1);
++      if (val2 < 0)
++              return val2;
+-      return val;
++      return val1 | (val2 << 8);
+ }
+ static void adt7475_write_word(struct i2c_client *client, int reg, u16 val)
diff --git a/queue-4.4/hwmon-ina2xx-fix-sysfs-shunt-resistor-read-access.patch b/queue-4.4/hwmon-ina2xx-fix-sysfs-shunt-resistor-read-access.patch
new file mode 100644 (file)
index 0000000..13d76cc
--- /dev/null
@@ -0,0 +1,82 @@
+From foo@baz Tue Oct  2 05:03:08 PDT 2018
+From: Lothar Felten <lothar.felten@gmail.com>
+Date: Tue, 14 Aug 2018 09:09:37 +0200
+Subject: hwmon: (ina2xx) fix sysfs shunt resistor read access
+
+From: Lothar Felten <lothar.felten@gmail.com>
+
+[ Upstream commit 3ad867001c91657c46dcf6656d52eb6080286fd5 ]
+
+fix the sysfs shunt resistor read access: return the shunt resistor
+value, not the calibration register contents.
+
+update email address
+
+Signed-off-by: Lothar Felten <lothar.felten@gmail.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/hwmon/ina2xx           |    2 +-
+ drivers/hwmon/ina2xx.c               |   13 +++++++++++--
+ include/linux/platform_data/ina2xx.h |    2 +-
+ 3 files changed, 13 insertions(+), 4 deletions(-)
+
+--- a/Documentation/hwmon/ina2xx
++++ b/Documentation/hwmon/ina2xx
+@@ -32,7 +32,7 @@ Supported chips:
+     Datasheet: Publicly available at the Texas Instruments website
+                http://www.ti.com/
+-Author: Lothar Felten <l-felten@ti.com>
++Author: Lothar Felten <lothar.felten@gmail.com>
+ Description
+ -----------
+--- a/drivers/hwmon/ina2xx.c
++++ b/drivers/hwmon/ina2xx.c
+@@ -17,7 +17,7 @@
+  * Bi-directional Current/Power Monitor with I2C Interface
+  * Datasheet: http://www.ti.com/product/ina230
+  *
+- * Copyright (C) 2012 Lothar Felten <l-felten@ti.com>
++ * Copyright (C) 2012 Lothar Felten <lothar.felten@gmail.com>
+  * Thanks to Jan Volkering
+  *
+  * This program is free software; you can redistribute it and/or modify
+@@ -328,6 +328,15 @@ static int ina2xx_set_shunt(struct ina2x
+       return 0;
+ }
++static ssize_t ina2xx_show_shunt(struct device *dev,
++                            struct device_attribute *da,
++                            char *buf)
++{
++      struct ina2xx_data *data = dev_get_drvdata(dev);
++
++      return snprintf(buf, PAGE_SIZE, "%li\n", data->rshunt);
++}
++
+ static ssize_t ina2xx_store_shunt(struct device *dev,
+                                 struct device_attribute *da,
+                                 const char *buf, size_t count)
+@@ -402,7 +411,7 @@ static SENSOR_DEVICE_ATTR(power1_input,
+ /* shunt resistance */
+ static SENSOR_DEVICE_ATTR(shunt_resistor, S_IRUGO | S_IWUSR,
+-                        ina2xx_show_value, ina2xx_store_shunt,
++                        ina2xx_show_shunt, ina2xx_store_shunt,
+                         INA2XX_CALIBRATION);
+ /* update interval (ina226 only) */
+--- a/include/linux/platform_data/ina2xx.h
++++ b/include/linux/platform_data/ina2xx.h
+@@ -1,7 +1,7 @@
+ /*
+  * Driver for Texas Instruments INA219, INA226 power monitor chips
+  *
+- * Copyright (C) 2012 Lothar Felten <l-felten@ti.com>
++ * Copyright (C) 2012 Lothar Felten <lothar.felten@gmail.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
diff --git a/queue-4.4/i2c-i801-allow-acpi-aml-access-i-o-ports-not-reserved-for-smbus.patch b/queue-4.4/i2c-i801-allow-acpi-aml-access-i-o-ports-not-reserved-for-smbus.patch
new file mode 100644 (file)
index 0000000..370b724
--- /dev/null
@@ -0,0 +1,94 @@
+From foo@baz Tue Oct  2 05:03:08 PDT 2018
+From: Mika Westerberg <mika.westerberg@linux.intel.com>
+Date: Thu, 30 Aug 2018 11:50:13 +0300
+Subject: i2c: i801: Allow ACPI AML access I/O ports not reserved for SMBus
+
+From: Mika Westerberg <mika.westerberg@linux.intel.com>
+
+[ Upstream commit 7fd6d98b89f382d414e1db528e29a67bbd749457 ]
+
+Commit 7ae81952cda ("i2c: i801: Allow ACPI SystemIO OpRegion to conflict
+with PCI BAR") made it possible for AML code to access SMBus I/O ports
+by installing custom SystemIO OpRegion handler and blocking i80i driver
+access upon first AML read/write to this OpRegion.
+
+However, while ThinkPad T560 does have SystemIO OpRegion declared under
+the SMBus device, it does not access any of the SMBus registers:
+
+    Device (SMBU)
+    {
+        ...
+
+        OperationRegion (SMBP, PCI_Config, 0x50, 0x04)
+        Field (SMBP, DWordAcc, NoLock, Preserve)
+        {
+            ,   5,
+            TCOB,   11,
+            Offset (0x04)
+        }
+
+        Name (TCBV, 0x00)
+        Method (TCBS, 0, NotSerialized)
+        {
+            If ((TCBV == 0x00))
+            {
+            TCBV = (\_SB.PCI0.SMBU.TCOB << 0x05)
+            }
+
+            Return (TCBV) /* \_SB_.PCI0.SMBU.TCBV */
+        }
+
+        OperationRegion (TCBA, SystemIO, TCBS (), 0x10)
+        Field (TCBA, ByteAcc, NoLock, Preserve)
+        {
+            Offset (0x04),
+            ,   9,
+            CPSC,   1
+        }
+    }
+
+Problem with the current approach is that it blocks all I/O port access
+and because this system has touchpad connected to the SMBus controller
+after first AML access (happens during suspend/resume cycle) the
+touchpad fails to work anymore.
+
+Fix this so that we allow ACPI AML I/O port access if it does not touch
+the region reserved for the SMBus.
+
+Fixes: 7ae81952cda ("i2c: i801: Allow ACPI SystemIO OpRegion to conflict with PCI BAR")
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=200737
+Reported-by: Yussuf Khalil <dev@pp3345.net>
+Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Reviewed-by: Jean Delvare <jdelvare@suse.de>
+Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
+Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/i2c/busses/i2c-i801.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/i2c/busses/i2c-i801.c
++++ b/drivers/i2c/busses/i2c-i801.c
+@@ -1272,6 +1272,13 @@ static void i801_add_tco(struct i801_pri
+ }
+ #ifdef CONFIG_ACPI
++static bool i801_acpi_is_smbus_ioport(const struct i801_priv *priv,
++                                    acpi_physical_address address)
++{
++      return address >= priv->smba &&
++             address <= pci_resource_end(priv->pci_dev, SMBBAR);
++}
++
+ static acpi_status
+ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits,
+                    u64 *value, void *handler_context, void *region_context)
+@@ -1287,7 +1294,7 @@ i801_acpi_io_handler(u32 function, acpi_
+        */
+       mutex_lock(&priv->acpi_lock);
+-      if (!priv->acpi_reserved) {
++      if (!priv->acpi_reserved && i801_acpi_is_smbus_ioport(priv, address)) {
+               priv->acpi_reserved = true;
+               dev_warn(&pdev->dev, "BIOS is accessing SMBus registers\n");
diff --git a/queue-4.4/net-hns-fix-length-and-page_offset-overflow-when-config_arm64_64k_pages.patch b/queue-4.4/net-hns-fix-length-and-page_offset-overflow-when-config_arm64_64k_pages.patch
new file mode 100644 (file)
index 0000000..d0f8248
--- /dev/null
@@ -0,0 +1,39 @@
+From foo@baz Tue Oct  2 05:03:08 PDT 2018
+From: Huazhong Tan <tanhuazhong@huawei.com>
+Date: Thu, 23 Aug 2018 11:10:10 +0800
+Subject: net: hns: fix length and page_offset overflow when CONFIG_ARM64_64K_PAGES
+
+From: Huazhong Tan <tanhuazhong@huawei.com>
+
+[ Upstream commit 3ed614dce3ca9912d22be215ff0f11104b69fe62 ]
+
+When enable the config item "CONFIG_ARM64_64K_PAGES", the size of PAGE_SIZE
+is 65536(64K). But the  type of length and page_offset are u16, they will
+overflow. So change them to u32.
+
+Fixes: 6fe6611ff275 ("net: add Hisilicon Network Subsystem hnae framework support")
+Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
+Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/hisilicon/hns/hnae.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/ethernet/hisilicon/hns/hnae.h
++++ b/drivers/net/ethernet/hisilicon/hns/hnae.h
+@@ -171,10 +171,10 @@ struct hnae_desc_cb {
+       /* priv data for the desc, e.g. skb when use with ip stack*/
+       void *priv;
+-      u16 page_offset;
+-      u16 reuse_flag;
++      u32 page_offset;
++      u32 length;     /* length of the buffer */
+-      u16 length;     /* length of the buffer */
++      u16 reuse_flag;
+        /* desc type, used by the ring user to mark the type of the priv data */
+       u16 type;
diff --git a/queue-4.4/serial-imx-restore-handshaking-irq-for-imx1.patch b/queue-4.4/serial-imx-restore-handshaking-irq-for-imx1.patch
new file mode 100644 (file)
index 0000000..068a5fb
--- /dev/null
@@ -0,0 +1,42 @@
+From 7e620984b62532783912312e334f3c48cdacbd5d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
+Date: Thu, 20 Sep 2018 14:11:17 +0200
+Subject: serial: imx: restore handshaking irq for imx1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+
+commit 7e620984b62532783912312e334f3c48cdacbd5d upstream.
+
+Back in 2015 when irda was dropped from the driver imx1 was broken. This
+change reintroduces the support for the third interrupt of the UART.
+
+Fixes: afe9cbb1a6ad ("serial: imx: drop support for IRDA")
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/serial/imx.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/tty/serial/imx.c
++++ b/drivers/tty/serial/imx.c
+@@ -1997,6 +1997,14 @@ static int serial_imx_probe(struct platf
+                                      dev_name(&pdev->dev), sport);
+               if (ret)
+                       return ret;
++
++              ret = devm_request_irq(&pdev->dev, rtsirq, imx_rtsint, 0,
++                                     dev_name(&pdev->dev), sport);
++              if (ret) {
++                      dev_err(&pdev->dev, "failed to request rts irq: %d\n",
++                              ret);
++                      return ret;
++              }
+       } else {
+               ret = devm_request_irq(&pdev->dev, rxirq, imx_int, 0,
+                                      dev_name(&pdev->dev), sport);
index 854abe1b2bf4829e4db9e9ed7017826c1f936898..8ab3095b9134220ba254a12c03a3458b4a06b982 100644 (file)
@@ -58,3 +58,13 @@ usb-remove-lpm-management-from-usb_driver_claim_interface.patch
 input-elantech-enable-middle-button-of-touchpad-on-thinkpad-p72.patch
 ib-srp-avoid-that-sg_reset-d-srp_device-triggers-an-infinite-loop.patch
 scsi-target-iscsi-use-bin2hex-instead-of-a-re-implementation.patch
+serial-imx-restore-handshaking-irq-for-imx1.patch
+arm64-kvm-tighten-guest-core-register-access-from-userspace.patch
+ext4-never-move-the-system.data-xattr-out-of-the-inode-body.patch
+thermal-of-thermal-disable-passive-polling-when-thermal-zone-is-disabled.patch
+net-hns-fix-length-and-page_offset-overflow-when-config_arm64_64k_pages.patch
+e1000-check-on-netif_running-before-calling-e1000_up.patch
+e1000-ensure-to-free-old-tx-rx-rings-in-set_ringparam.patch
+hwmon-ina2xx-fix-sysfs-shunt-resistor-read-access.patch
+hwmon-adt7475-make-adt7475_read_word-return-errors.patch
+i2c-i801-allow-acpi-aml-access-i-o-ports-not-reserved-for-smbus.patch
diff --git a/queue-4.4/thermal-of-thermal-disable-passive-polling-when-thermal-zone-is-disabled.patch b/queue-4.4/thermal-of-thermal-disable-passive-polling-when-thermal-zone-is-disabled.patch
new file mode 100644 (file)
index 0000000..0d4b08c
--- /dev/null
@@ -0,0 +1,43 @@
+From foo@baz Tue Oct  2 05:03:08 PDT 2018
+From: Anson Huang <Anson.Huang@nxp.com>
+Date: Tue, 31 Jul 2018 00:56:49 +0800
+Subject: thermal: of-thermal: disable passive polling when thermal zone is disabled
+
+From: Anson Huang <Anson.Huang@nxp.com>
+
+[ Upstream commit 152395fd03d4ce1e535a75cdbf58105e50587611 ]
+
+When thermal zone is in passive mode, disabling its mode from
+sysfs is NOT taking effect at all, it is still polling the
+temperature of the disabled thermal zone and handling all thermal
+trips, it makes user confused. The disabling operation should
+disable the thermal zone behavior completely, for both active and
+passive mode, this patch clears the passive_delay when thermal
+zone is disabled and restores it when it is enabled.
+
+Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
+Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
+Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/thermal/of-thermal.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/drivers/thermal/of-thermal.c
++++ b/drivers/thermal/of-thermal.c
+@@ -284,10 +284,13 @@ static int of_thermal_set_mode(struct th
+       mutex_lock(&tz->lock);
+-      if (mode == THERMAL_DEVICE_ENABLED)
++      if (mode == THERMAL_DEVICE_ENABLED) {
+               tz->polling_delay = data->polling_delay;
+-      else
++              tz->passive_delay = data->passive_delay;
++      } else {
+               tz->polling_delay = 0;
++              tz->passive_delay = 0;
++      }
+       mutex_unlock(&tz->lock);