reiserfs: bitmap: Assign array_size() to a variable
PATCH 1/1 reiserfs: bitmap: Assign array_size() to a variable
Assign array_size() to variable _size_ and use it in both vmalloc() and memset(). These sorts of multiplication factors need to be wrapped in array_size().
This issue was found with the help of Coccinelle and, audited and fixed manually.
Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
--- fs/reiserfs/bitmap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/reiserfs/bitmap.c +3 -2
@@ -1455,12 +1455,13 @@ int reiserfs_init_bitmap_cache(struct super_block *sb) {struct reiserfs_bitmap_info *bitmap;unsigned int bmap_nr =reiserfs_bmap_count (sb); +size_t size =array_size (bmap_nr,sizeof (*bitmap)); - bitmap =vmalloc (array_size (bmap_nr,sizeof (*bitmap))); + bitmap =vmalloc (size);if (bitmap ==NULL )return -ENOMEM ; -memset (bitmap,0xff ,sizeof (*bitmap) * bmap_nr); +memset (bitmap,0xff , size);SB_AP_BITMAP (sb) = bitmap;
Signature · 1 line
2.27.0
Quoted 9 lines · Gustavo A. R. Silva
Assign
array_size()to variable _size_ and use it in bothvmalloc()andmemset(). These sorts of multiplication factors need to be wrapped inarray_size().This issue was found with the help of Coccinelle and, audited and fixed manually.
Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
Signed-off-by Gustavo A. R. Silva <[email protected]>
Signature · 1 line
Kees Cook
Hi all,
Friendly ping: who can take this?
Thanks
--
Gustavo
Quoted 34 lines · Gustavo A. R. Silva
Assign
array_size()to variable _size_ and use it in bothvmalloc()andmemset(). These sorts of multiplication factors need to be wrapped inarray_size().This issue was found with the help of Coccinelle and, audited and fixed manually.
Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
Signed-off-by Gustavo A. R. Silva <[email protected]>--- fs/reiserfs/bitmap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)fs/reiserfs/bitmap.c +3
-2@@ -1455,12 +1455,13 @@ int reiserfs_init_bitmap_cache(struct super_block *sb) {struct reiserfs_bitmap_info *bitmap;unsigned int bmap_nr =reiserfs_bmap_count (sb); +size_t size =array_size (bmap_nr,sizeof (*bitmap)); - bitmap =vmalloc (array_size (bmap_nr,sizeof (*bitmap))); + bitmap =vmalloc (size);if (bitmap ==NULL )return -ENOMEM ; -memset (bitmap,0xff ,sizeof (*bitmap) * bmap_nr); +memset (bitmap,0xff , size);SB_AP_BITMAP (sb) = bitmap;