Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cast to long long before left-shifting too much. 

When left-shifting we must be sure that the value being
shifted is large enough to not lose bits.
The 'chunkssize' in CreateBitmap is only 'long' so it
can overflow.  So cast to 'long long' first.

Also fix a similar issue in Detail even though it isn't currently
being compiled.

Signed-off-by: NeilBrown <neilb@suse.de>
Reported-by: Tomasz Chmielewski <mangoo@wpkg.org>
This commit is contained in:
NeilBrown 2010-07-22 15:28:15 +10:00
parent 50526e9090
commit 3e4165619b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Detail.c
View File

@ -409,7 +409,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
#if 0
This is pretty boring
printf(" Reshape pos'n : %llu%s\n", (unsigned long long) info.reshape_progress<<9,
human_size(info.reshape_progress<<9));
human_size((unsigned long long)info.reshape_progress<<9));
#endif
if (info.delta_disks > 0)
printf(" Delta Devices : %d, (%d->%d)\n",

2
bitmap.c
View File

@ -373,7 +373,7 @@ int CreateBitmap(char *filename, int force, char uuid[16],
*/
chunksize = DEFAULT_BITMAP_CHUNK;
/* <<20 for 2^20 chunks, >>9 to convert bytes to sectors */
while (array_size > (chunksize << (20-9)))
while (array_size > ((unsigned long long)chunksize << (20-9)))
chunksize <<= 1;
}