From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Stephen Douthit <stephend@adiengineering.com>,
Dan Priamo <danp@adiengineering.com>,
Neil Horman <nhorman@tuxdriver.com>,
Wolfram Sang <wsa@the-dreams.de>
Subject: [PATCH 3.18 2/9] i2c: ismt: Return EMSGSIZE for block reads with bogus length
Date: Tue, 5 Sep 2017 09:09:36 +0200 [thread overview]
Message-ID: <20170905070902.008477031@linuxfoundation.org> (raw)
In-Reply-To: <20170905070901.809390741@linuxfoundation.org>
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;
next prev parent reply other threads:[~2017-09-05 7:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-05 7:09 [PATCH 3.18 0/9] 3.18.70-stable review Greg Kroah-Hartman
2017-09-05 7:09 ` [PATCH 3.18 1/9] i2c: ismt: Dont duplicate the receive length for block reads Greg Kroah-Hartman
2017-09-05 7:09 ` Greg Kroah-Hartman [this message]
2017-09-05 7:09 ` [PATCH 3.18 3/9] cpumask: fix spurious cpumask_of_node() on non-NUMA multi-node configs Greg Kroah-Hartman
2017-09-05 7:09 ` [PATCH 3.18 4/9] CIFS: Fix maximum SMB2 header size Greg Kroah-Hartman
2017-09-05 7:09 ` [PATCH 3.18 5/9] CIFS: remove endian related sparse warning Greg Kroah-Hartman
2017-09-05 7:09 ` [PATCH 3.18 6/9] wl1251: add a missing spin_lock_init() Greg Kroah-Hartman
2017-09-05 7:09 ` [PATCH 3.18 7/9] xfrm: policy: check policy direction value Greg Kroah-Hartman
2017-09-05 16:46 ` [PATCH 3.18 0/9] 3.18.70-stable review Guenter Roeck
2017-09-05 17:11 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170905070902.008477031@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=danp@adiengineering.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=stable@vger.kernel.org \
--cc=stephend@adiengineering.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).