On Sat, 25 Jun 2022 at 14:55, Christophe JAILLET
<christophe.jaillet@xxxxxxxxxx> wrote:
>
> Some functions of the bitmap API take advantage of the fact that a bitmap
> is an array of long.
>
> So, to make sure this assertion is correct, allocate bitmaps with
> bitmap_zalloc() instead of kzalloc()+hand-computed number of bytes.
>
> While at it, also use bitmap_free() instead of kfree() to keep the
> semantic.
>
> Fixes: 0ab30494bc4f ("memstick: add support for legacy memorysticks")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> I guess that it is not an issue in RL because memory allocation is
> certainly "rounding" to keep memory alignment.
> ---
> drivers/memstick/core/ms_block.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
> index 3993bdd4b519..f8f151163667 100644
> --- a/drivers/memstick/core/ms_block.c
> +++ b/drivers/memstick/core/ms_block.c
> @@ -1341,17 +1341,17 @@ static int msb_ftl_initialize(struct msb_data *msb)
> msb->zone_count = msb->block_count / MS_BLOCKS_IN_ZONE;
> msb->logical_block_count = msb->zone_count * 496 - 2;
>
> - msb->used_blocks_bitmap = kzalloc(msb->block_count / 8, GFP_KERNEL);
> - msb->erased_blocks_bitmap = kzalloc(msb->block_count / 8, GFP_KERNEL);
> + msb->used_blocks_bitmap = bitmap_zalloc(msb->block_count, GFP_KERNEL);
> + msb->erased_blocks_bitmap = bitmap_zalloc(msb->block_count, GFP_KERNEL);
> msb->lba_to_pba_table =
> kmalloc_array(msb->logical_block_count, sizeof(u16),
> GFP_KERNEL);
>
> if (!msb->used_blocks_bitmap || !msb->lba_to_pba_table ||
> !msb->erased_blocks_bitmap) {
> - kfree(msb->used_blocks_bitmap);
> + bitmap_free(msb->used_blocks_bitmap);
> + bitmap_free(msb->erased_blocks_bitmap);
> kfree(msb->lba_to_pba_table);
> - kfree(msb->erased_blocks_bitmap);
> return -ENOMEM;
> }
>
> @@ -1946,7 +1946,7 @@ static DEFINE_MUTEX(msb_disk_lock); /* protects against races in open/release */
> static void msb_data_clear(struct msb_data *msb)
> {
> kfree(msb->boot_page);
> - kfree(msb->used_blocks_bitmap);
> + bitmap_free(msb->used_blocks_bitmap);
> kfree(msb->lba_to_pba_table);
> kfree(msb->cache);
> msb->card = NULL;
> --
> 2.34.1
>
