Skip to contentSkip to conversation

fix emulated block write

PATCH New Hideki IWAMOTO 2 participants 2 messages Sep 22, 2005 – Sep 24, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix emulated block write

Excessive byte is written to the buffer.

Index: kernel/i2c-core.c
=================================RCS file: /home/cvs/i2c/kernel/i2c-core.c,v retrieving revision 1.110

i2c-core.c +2 -2
diff -u -r1.110 i2c-core.c
@@ -1292,7 +1292,7 @@
 			}
 			if(size = I2C_SMBUS_BLOCK_DATA_PEC)
 				(msg[0].len)++;
-			for (i = 1; i <= msg[0].len; i++)
+			for (i = 1; i < msg[0].len; i++)
 				msgbuf0[i] = data->block[i-1];
 		}
 		break;
@@ -1315,7 +1315,7 @@
 				"invalid block write size (%d)\n", data->block[0]);
 			return -1;
 		}
-		for (i = 1; i <= msg[0].len; i++)
+		for (i = 1; i < msg[0].len; i++)
 			msgbuf0[i] = data->block[i-1];
 		
 		/* set recv message */

----
Hideki IWAMOTO [email protected]

#1 lore raw

PATCH 1/1 fix emulated block write

Konbanwa Hideki,

Quoted 18 lines

Excessive byte is written to the buffer.

Index: kernel/i2c-core.c
=================================> RCS file: /home/cvs/i2c/kernel/i2c-core.c,v retrieving revision 1.110
diff -u -r1.110 i2c-core.c

i2c-core.c +1 -1
@@ -1292,7 +1292,7 @@
 			}
 			if(size = I2C_SMBUS_BLOCK_DATA_PEC)
 				(msg[0].len)++;
-			for (i = 1; i <= msg[0].len; i++)
+			for (i = 1; i < msg[0].len; i++)
 				msgbuf0[i] = data->block[i-1];
 		}
 		break;

i2c-core.c line 1321

Quoted 8 lines
i2c-core.c +1 -1
@@ -1315,7 +1315,7 @@
 				"invalid block write size (%d)\n", data->block[0]);
 			return -1;
 		}
-		for (i = 1; i <= msg[0].len; i++)
+		for (i = 1; i < msg[0].len; i++)
 			msgbuf0[i] = data->block[i-1];
 
 		/* set recv message */

It took me some time to figure it out, but once again you are right, our code was broken. Will fix in CVS and Linux 2.6.

Arigato,

Signature · 1 line
Jean Delvare