diff options
| author | Neil Brown <neilb@suse.de> | 2007-04-11 13:31:07 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-04-13 13:47:03 -0700 |
| commit | 2d6a42397823d5de05303941ad3df8a11e06a11a (patch) | |
| tree | cf2c41e513564f0c74b65b455b3b19757601b563 | |
| parent | 2031c51916f2fd44222715c8b1ba23d5f8ef56f9 (diff) | |
| download | lwn-2d6a42397823d5de05303941ad3df8a11e06a11a.tar.gz lwn-2d6a42397823d5de05303941ad3df8a11e06a11a.zip | |
Fix calculation for size of filemap_attr array in md/bitmap.
If 'num_pages' were ever 1 more than a multiple of 8 (32bit platforms)
for of 16 (64 bit platforms). filemap_attr would be allocated one
'unsigned long' shorter than required. We need a round-up in there.
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/md/bitmap.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 059704fbb753..cef12872508a 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c @@ -863,9 +863,7 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) /* We need 4 bits per page, rounded up to a multiple of sizeof(unsigned long) */ bitmap->filemap_attr = kzalloc( - (((num_pages*4/8)+sizeof(unsigned long)-1) - /sizeof(unsigned long)) - *sizeof(unsigned long), + roundup( DIV_ROUND_UP(num_pages*4, 8), sizeof(unsigned long)), GFP_KERNEL); if (!bitmap->filemap_attr) goto out; |