Re: [PATCH 1/1] bcache: memset on stack variables in bch_btree_check() and bch_sectors_dirty_init()

[Coly Li <colyli@suse.de>]

> 2022年6月30日 19:18，Greg KH <gregkh@linuxfoundation.org> 写道：
> 
> On Tue, Jun 28, 2022 at 05:29:44PM +0800, Coly Li wrote:
>> 
>> 
>>> 2022年6月28日 17:10，Greg KH <gregkh@linuxfoundation.org> 写道：
>>> 
>>> On Tue, Jun 28, 2022 at 04:49:33PM +0800, Coly Li wrote:
>>>> The local variables check_state (in bch_btree_check()) and state (in
>>>> bch_sectors_dirty_init()) should be fully filled by 0, because before
>>>> allocating them on stack, they were dynamically allocated by kzalloc().
>>>> 
>>>> Signed-off-by: Coly Li <colyli@suse.de>
>>>> Link: https://lore.kernel.org/r/20220527152818.27545-2-colyli@suse.de
>>>> Signed-off-by: Jens Axboe <axboe@kernel.dk>
>>>> ---
>>>> drivers/md/bcache/btree.c     | 1 +
>>>> drivers/md/bcache/writeback.c | 1 +
>>>> 2 files changed, 2 insertions(+)
>>>> 
>>>> diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
>>>> index 2362bb8ef6d1..e136d6edc1ed 100644
>>>> --- a/drivers/md/bcache/btree.c
>>>> +++ b/drivers/md/bcache/btree.c
>>>> @@ -2017,6 +2017,7 @@ int bch_btree_check(struct cache_set *c)
>>>> 	if (c->root->level == 0)
>>>> 		return 0;
>>>> 
>>>> +	memset(&check_state, 0, sizeof(struct btree_check_state));
>>>> 	check_state.c = c;
>>>> 	check_state.total_threads = bch_btree_chkthread_nr();
>>>> 	check_state.key_idx = 0;
>>>> diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c
>>>> index 75b71199800d..d138a2d73240 100644
>>>> --- a/drivers/md/bcache/writeback.c
>>>> +++ b/drivers/md/bcache/writeback.c
>>>> @@ -950,6 +950,7 @@ void bch_sectors_dirty_init(struct bcache_device *d)
>>>> 		return;
>>>> 	}
>>>> 
>>>> +	memset(&state, 0, sizeof(struct bch_dirty_init_state));
>>>> 	state.c = c;
>>>> 	state.d = d;
>>>> 	state.total_threads = bch_btre_dirty_init_thread_nr();
>>>> -- 
>>>> 2.35.3
>>>> 
>>> 
>>> What is the git commit id of this patch in Linus's tree?
>> 
>> 
>> Oops, the commit tag in email was filtered out. This patch in Linus tree is
>> 
>> commit 7d6b902ea0e0 (“bcache: memset on stack variables in bch_btree_check() and bch_sectors_dirty_init()”)
> 
> Thanks, now queued up.

Nice, thank you for taking care of it :-)

Coly Li