Skip to contentSkip to conversation

misc: isl29020: fix signedness bug

PATCH In review Vasiliy Kulikov 2 participants 2 messages Oct 28, 2010 – Oct 29, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 misc: isl29020: fix signedness bug

i2c_smbus_write_byte_data() may return negative error code. This is not seen to als_sensing_range_store() as the result is stored in unsigned int. Made it signed.

---
Compile tested.

 drivers/misc/isl29020.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/misc/isl29020.c +1 -1
index 34fe835..629d31e 100644
@@ -87,7 +87,7 @@ static ssize_t als_sensing_range_store(struct device *dev,
 		struct device_attribute *attr, const  char *buf, size_t count)
 {
 	struct i2c_client *client = to_i2c_client(dev);
-	unsigned int ret_val;
+	int ret_val;
 	unsigned long val;
 
 	if (strict_strtoul(buf, 10, &val))
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 16 lines · On Thu, 28 Oct 2010 15:14:03 +0400 Vasiliy Kulikov <[email protected]> wrote:

i2c_smbus_write_byte_data() may return negative error code. This is not seen to als_sensing_range_store() as the result is stored in unsigned int. Made it signed.

---
Compile tested.

 drivers/misc/isl29020.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/misc/isl29020.c +0 -0
index 34fe835..629d31e 100644

drivers/misc/isl29020.c static ssize_t als_sensing_range_store(struct device *dev, · line 93

Quoted 8 lines
drivers/misc/isl29020.c +1 -1
@@ -87,7 +87,7 @@ static ssize_t als_sensing_range_store(struct device *dev,
 		struct device_attribute *attr, const  char *buf, size_t count)
 {
 	struct i2c_client *client = to_i2c_client(dev);
-	unsigned int ret_val;
+	int ret_val;
 	unsigned long val;
 
 	if (strict_strtoul(buf, 10, &val))

yup.

It also needs this:

drivers/misc/isl29020.c: don't ignore the i2c_smbus_read_byte_data() return value

From: Andrew Morton <[email protected]>

If i2c_smbus_read_byte_data() fails, this driver will write a mangled errno value into the hardware.

Cc Vasiliy Kulikov <[email protected]>
Cc Liu Hong <[email protected]>
Cc Kalhan Trisal <[email protected]>
Cc Arjan van de Ven <[email protected]>
Cc Alan Cox <[email protected]>

---

 drivers/misc/isl29020.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/misc/isl29020.c renamed from drivers/misc/isl29020.c~a +3 -1
diff -puN drivers/misc/isl29020.c~a drivers/misc/isl29020.c
@@ -106,8 +106,10 @@ static ssize_t als_sensing_range_store(s
 		val = 4;
 
 	ret_val = i2c_smbus_read_byte_data(client, 0x00);
+	if (ret_val < 0)
+		return ret_val;
 
-	ret_val &= 0xFC; /*reset the bit before setting them */
+	ret_val &= 0xFC; /* reset the bit before setting them */
 	ret_val |= val - 1;
 	ret_val = i2c_smbus_write_byte_data(client, 0x00, ret_val);
 

_