2016-10-10 17:13:50

by Hoan Tran

[permalink] [raw]
Subject: [PATCH] i2c: xgene: Avoid dma_buffer overrun

SMBus block command uses the first byte of buffer for the data length.
The dma_buffer should be increased by 1 to avoid the overrun issue.

Reported-by: Phil Endecott <[email protected]>
Signed-off-by: Hoan Tran <[email protected]>
---
drivers/i2c/busses/i2c-xgene-slimpro.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-xgene-slimpro.c b/drivers/i2c/busses/i2c-xgene-slimpro.c
index 4233f56..3c38029 100644
--- a/drivers/i2c/busses/i2c-xgene-slimpro.c
+++ b/drivers/i2c/busses/i2c-xgene-slimpro.c
@@ -105,7 +105,7 @@ struct slimpro_i2c_dev {
struct mbox_chan *mbox_chan;
struct mbox_client mbox_client;
struct completion rd_complete;
- u8 dma_buffer[I2C_SMBUS_BLOCK_MAX];
+ u8 dma_buffer[I2C_SMBUS_BLOCK_MAX + 1]; /* dma_buffer[0] is used for length */
u32 *resp_msg;
};

--
1.9.1


2016-10-24 22:30:16

by Hoan Tran

[permalink] [raw]
Subject: Re: [PATCH] i2c: xgene: Avoid dma_buffer overrun

On Mon, Oct 10, 2016 at 10:13 AM, Hoan Tran <[email protected]> wrote:
> SMBus block command uses the first byte of buffer for the data length.
> The dma_buffer should be increased by 1 to avoid the overrun issue.
>
> Reported-by: Phil Endecott <[email protected]>
> Signed-off-by: Hoan Tran <[email protected]>
> ---
> drivers/i2c/busses/i2c-xgene-slimpro.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/i2c/busses/i2c-xgene-slimpro.c b/drivers/i2c/busses/i2c-xgene-slimpro.c
> index 4233f56..3c38029 100644
> --- a/drivers/i2c/busses/i2c-xgene-slimpro.c
> +++ b/drivers/i2c/busses/i2c-xgene-slimpro.c
> @@ -105,7 +105,7 @@ struct slimpro_i2c_dev {
> struct mbox_chan *mbox_chan;
> struct mbox_client mbox_client;
> struct completion rd_complete;
> - u8 dma_buffer[I2C_SMBUS_BLOCK_MAX];
> + u8 dma_buffer[I2C_SMBUS_BLOCK_MAX + 1]; /* dma_buffer[0] is used for length */
> u32 *resp_msg;
> };
>
> --
> 1.9.1
>

Any comments on this patch.

Thanks
Hoan

2016-10-25 09:50:46

by Wolfram Sang

[permalink] [raw]
Subject: Re: [PATCH] i2c: xgene: Avoid dma_buffer overrun

On Mon, Oct 10, 2016 at 10:13:10AM -0700, Hoan Tran wrote:
> SMBus block command uses the first byte of buffer for the data length.
> The dma_buffer should be increased by 1 to avoid the overrun issue.
>
> Reported-by: Phil Endecott <[email protected]>
> Signed-off-by: Hoan Tran <[email protected]>

Added stable and applied to for-current, thanks!

Attachments:
(No filename) (364.00 B)
 signature.asc (819.00 B)
 Download all attachments