3.18-stable patches

added patches:
	eeprom-at24-check-at24_read-write-arguments.patch

diff --git a/queue-3.18/eeprom-at24-check-at24_read-write-arguments.patch b/queue-3.18/eeprom-at24-check-at24_read-write-arguments.patch
new file mode 100644 (file)
index 0000000..909c9a7
--- /dev/null
+++ b/queue-3.18/eeprom-at24-check-at24_read-write-arguments.patch
@@ -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
+@@ -274,6 +274,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.
+@@ -328,6 +331,9 @@ static ssize_t at24_eeprom_write(struct
+       unsigned long timeout, write_time;
+       unsigned next_page;
+ 
++      if (offset + count > at24->chip.byte_len)
++              return -EINVAL;
++
+       /* Get corresponding I2C address and adjust offset */
+       client = at24_translate_offset(at24, &offset);
+ 

diff --git a/queue-3.18/series b/queue-3.18/series
index 454a192fe121e934097c5d363ec633acfce85272..3ed87d3d5f57e5676bb45a745cf6188af2774776 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -5,3 +5,4 @@ mm-madvise.c-fix-madvise-infinite-loop-under-special-circumstances.patch
 btrfs-clear-space-cache-inode-generation-always.patch
 kvm-x86-exit-to-user-mode-on-ud-intercept-when-emulator-requires.patch
 kvm-x86-inject-exceptions-produced-by-x86_decode_insn.patch
+eeprom-at24-check-at24_read-write-arguments.patch