]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 Dec 2017 10:21:28 +0000 (11:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 Dec 2017 10:21:28 +0000 (11:21 +0100)
added patches:
eeprom-at24-check-at24_read-write-arguments.patch

queue-4.4/eeprom-at24-check-at24_read-write-arguments.patch [new file with mode: 0644]
queue-4.4/series

diff --git a/queue-4.4/eeprom-at24-check-at24_read-write-arguments.patch b/queue-4.4/eeprom-at24-check-at24_read-write-arguments.patch
new file mode 100644 (file)
index 0000000..87683c6
--- /dev/null
@@ -0,0 +1,42 @@
+From d9bcd462daf34aebb8de9ad7f76de0198bb5a0f0 Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Fri, 24 Nov 2017 07:47:50 +0100
+Subject: eeprom: at24: check at24_read/write arguments
+
+From: Heiner Kallweit <hkallweit1@gmail.com>
+
+commit d9bcd462daf34aebb8de9ad7f76de0198bb5a0f0 upstream.
+
+So far we completely rely on the caller to provide valid arguments.
+To be on the safe side perform an own sanity check.
+
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/misc/eeprom/at24.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/misc/eeprom/at24.c
++++ b/drivers/misc/eeprom/at24.c
+@@ -257,6 +257,9 @@ static ssize_t at24_read(struct at24_dat
+       if (unlikely(!count))
+               return count;
++      if (off + count > at24->chip.byte_len)
++              return -EINVAL;
++
+       /*
+        * Read data from chip, protecting against concurrent updates
+        * from this host, but not from other I2C masters.
+@@ -311,6 +314,9 @@ static ssize_t at24_eeprom_write(struct
+       unsigned long timeout, write_time;
+       unsigned next_page;
++      if (off + count > at24->chip.byte_len)
++              return -EINVAL;
++
+       /* Get corresponding I2C address and adjust offset */
+       client = at24_translate_offset(at24, &offset);
index 8a6d376702f35cf4a874efd7ab6486c30ac30109..e0287719a1abd4c1d8edb5f5d052c8e5b77d4978 100644 (file)
@@ -13,3 +13,4 @@ kvm-x86-pvclock-handle-first-time-write-to-pvclock-page-contains-random-junk.pat
 kvm-x86-exit-to-user-mode-on-ud-intercept-when-emulator-requires.patch
 kvm-x86-inject-exceptions-produced-by-x86_decode_insn.patch
 mmc-core-do-not-leave-the-block-driver-in-a-suspended-state.patch
+eeprom-at24-check-at24_read-write-arguments.patch