Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1726491

[PATCH 3.18 2/9] i2c: ismt: Return EMSGSIZE for block reads with bogus length

Show all headers | View raw

3.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Stephen Douthit <stephend@adiengineering.com>

commit ba201c4f5ebe13d7819081756378777d8153f23e upstream.

Compare the number of bytes actually seen on the wire to the byte
count field returned by the slave device.

Previously we just overwrote the byte count returned by the slave
with the real byte count and let the caller figure out if the
message was sane.

Signed-off-by: Stephen Douthit <stephend@adiengineering.com>
Tested-by: Dan Priamo <danp@adiengineering.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/i2c/busses/i2c-ismt.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/drivers/i2c/busses/i2c-ismt.c
+++ b/drivers/i2c/busses/i2c-ismt.c
@@ -340,8 +340,10 @@ static int ismt_process_desc(const struc
 			break;
 		case I2C_SMBUS_BLOCK_DATA:
 		case I2C_SMBUS_I2C_BLOCK_DATA:
+			if (desc->rxbytes != dma_buffer[0] + 1)
+				return -EMSGSIZE;
+
 			memcpy(data->block, dma_buffer, desc->rxbytes);
-			data->block[0] = desc->rxbytes - 1;
 			break;
 		}
 		return 0;

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 3.18 0/9] 3.18.70-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-09-05 09:10 +0200
  [PATCH 3.18 3/9] cpumask: fix spurious cpumask_of_node() on non-NUMA multi-node configs Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-09-05 09:20 +0200
  [PATCH 3.18 6/9] wl1251: add a missing spin_lock_init() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-09-05 09:20 +0200
  [PATCH 3.18 5/9] CIFS: remove endian related sparse warning Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-09-05 09:40 +0200
  [PATCH 3.18 7/9] xfrm: policy: check policy direction value Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-09-05 09:40 +0200
  [PATCH 3.18 1/9] i2c: ismt: Dont duplicate the receive length for block reads Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-09-05 09:40 +0200
  [PATCH 3.18 2/9] i2c: ismt: Return EMSGSIZE for block reads with bogus length Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-09-05 09:40 +0200
  [PATCH 3.18 4/9] CIFS: Fix maximum SMB2 header size Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-09-05 09:40 +0200
  Re: [PATCH 3.18 0/9] 3.18.70-stable review Guenter Roeck <linux@roeck-us.net> - 2017-09-05 18:50 +0200
  Re: [PATCH 3.18 0/9] 3.18.70-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2017-09-05 19:20 +0200

csiph-web