Re: [PATCH] btrfs: compression: Adjust cb->compressed_folios allocation type
From: Kees Cook
Date: Wed Apr 30 2025 - 15:02:44 EST
On Sat, Apr 26, 2025 at 12:55:21AM -0600, Gustavo A. R. Silva wrote:
>
>
> On 26/04/25 00:23, Kees Cook wrote:
> > In preparation for making the kmalloc family of allocators type aware,
> > we need to make sure that the returned type from the allocation matches
> > the type of the variable being assigned. (Before, the allocator would
> > always return "void *", which can be implicitly cast to any pointer type.)
> >
> > The assigned type is "struct folio **" but the returned type will be
> > "struct page **". These are the same allocation size (pointer size), but
> > the types don't match. Adjust the allocation type to match the assignment.
> >
> > Signed-off-by: Kees Cook <kees@xxxxxxxxxx>
> > ---
> > Cc: Chris Mason <clm@xxxxxx>
> > Cc: Josef Bacik <josef@xxxxxxxxxxxxxx>
> > Cc: David Sterba <dsterba@xxxxxxxx>
> > Cc: <linux-btrfs@xxxxxxxxxxxxxxx>
> > ---
> > fs/btrfs/compression.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> > index e7f8ee5d48a4..7f11ef559be6 100644
> > --- a/fs/btrfs/compression.c
> > +++ b/fs/btrfs/compression.c
> > @@ -606,7 +606,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio)
> > free_extent_map(em);
> > cb->nr_folios = DIV_ROUND_UP(compressed_len, PAGE_SIZE);
> > - cb->compressed_folios = kcalloc(cb->nr_folios, sizeof(struct page *), GFP_NOFS);
> > + cb->compressed_folios = kcalloc(cb->nr_folios, sizeof(struct folio *), GFP_NOFS);
>
> Why not `sizeof(*cb->compressed_folios)` as in other patches? :)
I generally trying to match the coding style of each instance, though
sometimes it wasn't possible. Here, since a type is named for the
sizeof(), I followed that style.
--
Kees Cook