Patch "nilfs2: initialize "struct nilfs_binfo_dat"->bi_pad field" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    nilfs2: initialize "struct nilfs_binfo_dat"->bi_pad field

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     nilfs2-initialize-struct-nilfs_binfo_dat-bi_pad-fiel.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 90f3f6a64c4b5c5f4df39d11561f02c4ff9a75f6
Author: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Date:   Mon Mar 27 00:21:46 2023 +0900

    nilfs2: initialize "struct nilfs_binfo_dat"->bi_pad field
    
    [ Upstream commit 7397031622e05ca206e2d674ec199d6bb66fc9ba ]
    
    nilfs_btree_assign_p() and nilfs_direct_assign_p() are not initializing
    "struct nilfs_binfo_dat"->bi_pad field, causing uninit-value reports when
    being passed to CRC function.
    
    Link: https://lkml.kernel.org/r/20230326152146.15872-1-konishi.ryusuke@xxxxxxxxx
    Reported-by: syzbot <syzbot+048585f3f4227bb2b49b@xxxxxxxxxxxxxxxxxxxxxxxxx>
      Link: https://syzkaller.appspot.com/bug?extid=048585f3f4227bb2b49b
    Reported-by: Dipanjan Das <mail.dipanjan.das@xxxxxxxxx>
      Link: https://lkml.kernel.org/r/CANX2M5bVbzRi6zH3PTcNE_31TzerstOXUa9Bay4E6y6dX23_pg@xxxxxxxxxxxxxx
    Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxx>
    Cc: Alexander Potapenko <glider@xxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index bd24a33fc72e1..42617080a8384 100644
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -2224,6 +2224,7 @@ static int nilfs_btree_assign_p(struct nilfs_bmap *btree,
 	/* on-disk format */
 	binfo->bi_dat.bi_blkoff = cpu_to_le64(key);
 	binfo->bi_dat.bi_level = level;
+	memset(binfo->bi_dat.bi_pad, 0, sizeof(binfo->bi_dat.bi_pad));
 
 	return 0;
 }
diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c
index 8f802f7b0840b..893ab36824cc2 100644
--- a/fs/nilfs2/direct.c
+++ b/fs/nilfs2/direct.c
@@ -319,6 +319,7 @@ static int nilfs_direct_assign_p(struct nilfs_bmap *direct,
 
 	binfo->bi_dat.bi_blkoff = cpu_to_le64(key);
 	binfo->bi_dat.bi_level = 0;
+	memset(binfo->bi_dat.bi_pad, 0, sizeof(binfo->bi_dat.bi_pad));
 
 	return 0;
 }