Patchwork Bug in mtd_speedtest?

login
register
mail settings
Submitter David Lambert
Date March 4, 2011, 5:53 p.m.
Message ID <4D71270E.9030204@lambsys.com>
Download mbox | patch
Permalink /patch/85428/
State New
Headers show

Comments

David Lambert - March 4, 2011, 5:53 p.m.
Artem,
     Please find attached patch.

Regards,

Dave.

On 03/04/2011 12:59 AM, Artem Bityutskiy wrote:
> On Thu, 2011-03-03 at 17:45 -0600, David Lambert wrote:
>> I think I may have found an overflow condition in the speed calculation
>> of mtd_speedtest on some platforms with larger flash partitions:
>>
>> Consider for example if goodebcnt = 15000, and mtd->erasesize =
>> 256*1024, then there is an intermediate product of  3932160000 which
>> results in the sign bit being set on a 32 bit integer. Maybe k should be
>> an unsigned long long?
> Please, just send a patch :-)
>
Jon Povey - March 7, 2011, 4:11 a.m.
linux-mtd-bounces@lists.infradead.org wrote:
> Artem,
>      Please find attached patch.

The comments make lines over 80 chars and are not needed,
it is clear enough from the code what it does.

--
Jon Povey
jon.povey@racelogic.co.uk

Racelogic is a limited company registered in England. Registered number 2743719 .
Registered Office Unit 10, Swan Business Centre, Osier Way, Buckingham, Bucks, MK18 1TB .

The information contained in this electronic mail transmission is intended by Racelogic Ltd for the use of the named individual or entity to which it is directed and may contain information that is confidential or privileged. If you have received this electronic mail transmission in error, please delete it from your system without copying or forwarding it, and notify the sender of the error by reply email so that the sender's address records can be corrected. The views expressed by the sender of this communication do not necessarily represent those of Racelogic Ltd. Please note that Racelogic reserves the right to monitor e-mail communications passing through its network

Patch

Index: mtd_speedtest.c
===================================================================
RCS file: /home/cvsroot/ECMB/src/snapgear/linux-2.6.30.1.x/drivers/mtd/tests/mtd_speedtest.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mtd_speedtest.c
--- mtd_speedtest.c	10 Aug 2009 19:42:00 -0000	1.1.1.1
+++ mtd_speedtest.c	4 Mar 2011 17:51:23 -0000
@@ -281,13 +281,14 @@ 
 
 static long calc_speed(void)
 {
-	long ms, k, speed;
+	uint64_t k;
+	long ms;
 
-	ms = (finish.tv_sec - start.tv_sec) * 1000 +
-	     (finish.tv_usec - start.tv_usec) / 1000;
-	k = goodebcnt * mtd->erasesize / 1024;
-	speed = (k * 1000) / ms;
-	return speed;
+	ms = (finish.tv_sec - start.tv_sec) * 1000 + /* Time in milli-seconds from start to ...*/
+	     (finish.tv_usec - start.tv_usec) / 1000;	  /* finish */
+	k = (goodebcnt * (mtd->erasesize / 1024) * 1000); /* Number of kBytes transferred * 1000 */
+	do_div(k, ms);	  /* k now contains number of kBytes/second */
+	return k;
 }
 
 static int scan_for_bad_eraseblocks(void)