diff mbox

i2c: at91: add a sanity check on i2c message length

Message ID 1349879158-27268-1-git-send-email-ludovic.desroches@atmel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ludovic Desroches Oct. 10, 2012, 2:25 p.m. UTC
From: Ludovic Desroches <ludovic.desroches@atmel.com>

If the i2c message length is zero, i2c-at91 will directly return an error
instead of trying to send a zero-length message.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
---

fix for 3.7

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

Comments

Ludovic Desroches Oct. 24, 2012, 2:34 p.m. UTC | #1
Hi Wolfram,

Le 10/10/2012 04:25 PM, ludovic.desroches@atmel.com a écrit :
> From: Ludovic Desroches <ludovic.desroches@atmel.com>
>
> If the i2c message length is zero, i2c-at91 will directly return an error
> instead of trying to send a zero-length message.
>
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
> ---
>
> fix for 3.7
>
>   drivers/i2c/busses/i2c-at91.c | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
> index aa59a25..eaddc77 100644
> --- a/drivers/i2c/busses/i2c-at91.c
> +++ b/drivers/i2c/busses/i2c-at91.c
> @@ -263,6 +263,9 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num)
>   	unsigned int_addr_flag = 0;
>   	struct i2c_msg *m_start = msg;
>
> +	if (!msg->len)
> +		return -EINVAL;
> +
>   	dev_dbg(&adap->dev, "at91_xfer: processing %d messages:\n", num);
>
>   	/*
>

Could you take this fix for 3.7?

Thanks

Regards

Ludovic
Wolfram Sang Nov. 1, 2012, 10:29 p.m. UTC | #2
On Wed, Oct 10, 2012 at 04:25:58PM +0200, ludovic.desroches@atmel.com wrote:
> From: Ludovic Desroches <ludovic.desroches@atmel.com>
> 
> If the i2c message length is zero, i2c-at91 will directly return an error
> instead of trying to send a zero-length message.
> 
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>

What happens if you send a 0 byte message? Some hardware is able to do
this and it will be used in SMBUS QUICK which the driver states to
support according to at91_twi_func().

Regards,

   Wolfram
Ludovic Desroches Nov. 2, 2012, 11:04 a.m. UTC | #3
Hi Wolfram,

Le 11/01/2012 11:29 PM, Wolfram Sang a écrit :
> On Wed, Oct 10, 2012 at 04:25:58PM +0200, ludovic.desroches@atmel.com wrote:
>> From: Ludovic Desroches <ludovic.desroches@atmel.com>
>>
>> If the i2c message length is zero, i2c-at91 will directly return an error
>> instead of trying to send a zero-length message.
>>
>> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
>
> What happens if you send a 0 byte message? Some hardware is able to do
> this and it will be used in SMBUS QUICK which the driver states to
> support according to at91_twi_func().

Without this I had some data corruption when writing to / reading from a 
serial eeprom (depending on the IP version).

Yes SMBUS quick command is supported but is not managed in the driver, 
we have to tell explicitly the IP that we want to send this command.


Regards

Ludovic

>
> Regards,
>
>     Wolfram
>
Wolfram Sang Nov. 2, 2012, 11:14 a.m. UTC | #4
On Fri, Nov 02, 2012 at 12:04:45PM +0100, ludovic.desroches wrote:
> Hi Wolfram,
> 
> Le 11/01/2012 11:29 PM, Wolfram Sang a écrit :
> >On Wed, Oct 10, 2012 at 04:25:58PM +0200, ludovic.desroches@atmel.com wrote:
> >>From: Ludovic Desroches <ludovic.desroches@atmel.com>
> >>
> >>If the i2c message length is zero, i2c-at91 will directly return an error
> >>instead of trying to send a zero-length message.
> >>
> >>Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
> >
> >What happens if you send a 0 byte message? Some hardware is able to do
> >this and it will be used in SMBUS QUICK which the driver states to
> >support according to at91_twi_func().
> 
> Without this I had some data corruption when writing to / reading
> from a serial eeprom (depending on the IP version).
> 
> Yes SMBUS quick command is supported but is not managed in the
> driver, we have to tell explicitly the IP that we want to send this
> command.

Ok, so unless you want to implement the support, please update this
patch with a comment that SMBUS_QUICK is a TODO and remove the
SMBUS_QUICK capability.
Ludovic Desroches Nov. 2, 2012, 4 p.m. UTC | #5
Le 11/02/2012 12:14 PM, Wolfram Sang a écrit :
> On Fri, Nov 02, 2012 at 12:04:45PM +0100, ludovic.desroches wrote:
>> Hi Wolfram,
>>
>> Le 11/01/2012 11:29 PM, Wolfram Sang a écrit :
>>> On Wed, Oct 10, 2012 at 04:25:58PM +0200, ludovic.desroches@atmel.com wrote:
>>>> From: Ludovic Desroches <ludovic.desroches@atmel.com>
>>>>
>>>> If the i2c message length is zero, i2c-at91 will directly return an error
>>>> instead of trying to send a zero-length message.
>>>>
>>>> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
>>>
>>> What happens if you send a 0 byte message? Some hardware is able to do
>>> this and it will be used in SMBUS QUICK which the driver states to
>>> support according to at91_twi_func().
>>
>> Without this I had some data corruption when writing to / reading
>> from a serial eeprom (depending on the IP version).
>>
>> Yes SMBUS quick command is supported but is not managed in the
>> driver, we have to tell explicitly the IP that we want to send this
>> command.
>
> Ok, so unless you want to implement the support, please update this
> patch with a comment that SMBUS_QUICK is a TODO and remove the
> SMBUS_QUICK capability.
>

Implementation should not be a huge task, only one bit to set in a 
register but I have no device to test it.
So I will choose to remove the SMBUS_QUICK capability.

Hi Nikolaus,

Did you test the driver with SMBus compatible devices? Can I keep other 
SMBus capabilities from SMBUS_EMUL?

Thanks

Regards

Ludovic
Wolfram Sang Nov. 3, 2012, 2:16 p.m. UTC | #6
> >>Yes SMBUS quick command is supported but is not managed in the
> >>driver, we have to tell explicitly the IP that we want to send this
> >>command.
> >
> >Ok, so unless you want to implement the support, please update this
> >patch with a comment that SMBUS_QUICK is a TODO and remove the
> >SMBUS_QUICK capability.
> >
> 
> Implementation should not be a huge task, only one bit to set in a
> register but I have no device to test it.

'i2cdetect' from i2c-tools uses SMBUS_QUICK as one method to detect
chips. Most slaves (both I2C and SMBus) react to that, so that would do
in my book.

> Did you test the driver with SMBus compatible devices? Can I keep
> other SMBus capabilities from SMBUS_EMUL?

The rest should be fine.
Voss, Nikolaus Nov. 5, 2012, 6:08 a.m. UTC | #7
ludovic.desroches wrote on Friday, November 02, 2012 5:01 PM:
> Le 11/02/2012 12:14 PM, Wolfram Sang a écrit :
> > On Fri, Nov 02, 2012 at 12:04:45PM +0100, ludovic.desroches wrote:
> >> Hi Wolfram,
> >>
> >> Le 11/01/2012 11:29 PM, Wolfram Sang a écrit :
> >>> On Wed, Oct 10, 2012 at 04:25:58PM +0200,
> ludovic.desroches@atmel.com wrote:
> >>>> From: Ludovic Desroches <ludovic.desroches@atmel.com>
> >>>>
> >>>> If the i2c message length is zero, i2c-at91 will directly return an error
> >>>> instead of trying to send a zero-length message.
> >>>>
> >>>> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
> >>>
> >>> What happens if you send a 0 byte message? Some hardware is able to
> do
> >>> this and it will be used in SMBUS QUICK which the driver states to
> >>> support according to at91_twi_func().
> >>
> >> Without this I had some data corruption when writing to / reading
> >> from a serial eeprom (depending on the IP version).
> >>
> >> Yes SMBUS quick command is supported but is not managed in the
> >> driver, we have to tell explicitly the IP that we want to send this
> >> command.
> >
> > Ok, so unless you want to implement the support, please update this
> > patch with a comment that SMBUS_QUICK is a TODO and remove the
> > SMBUS_QUICK capability.
> >
> 
> Implementation should not be a huge task, only one bit to set in a
> register but I have no device to test it.
> So I will choose to remove the SMBUS_QUICK capability.
> 
> Hi Nikolaus,
> 
> Did you test the driver with SMBus compatible devices? Can I keep other
> SMBus capabilities from SMBUS_EMUL?

Hi Ludovic,

yes, I use this driver with the sbs driver to query a smbus-attached
battery with a TI bq chip (I actually wrote this driver only for this
purpose). I implemented and tested SMBUS_BLOCK but not
SMBUS_QUICK...

Niko
diff mbox

Patch

diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index aa59a25..eaddc77 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -263,6 +263,9 @@  static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num)
 	unsigned int_addr_flag = 0;
 	struct i2c_msg *m_start = msg;
 
+	if (!msg->len)
+		return -EINVAL;
+
 	dev_dbg(&adap->dev, "at91_xfer: processing %d messages:\n", num);
 
 	/*