ocfs2: Fix shift-out-of-bounds UBSAN bug in ocfs2_verify_volume()
PATCH v2 1/1 ocfs2: Fix shift-out-of-bounds UBSAN bug in ocfs2_verify_volume()
This patch addresses a shift-out-of-bounds error in the ocfs2_verify_volume() function, identified by UBSAN. The bug was triggered by an invalid s_clustersize_bits value (e.g., 1548), which caused the expression "1 << le32_to_cpu(di->id2.i_super.s_clustersize_bits)" to exceed the limits of a 32-bit integer,
leading to an out-of-bounds shift.
--- fs/ocfs2/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ocfs2/super.c +2 -2
@@ -2357,8 +2357,8 @@ static int ocfs2_verify_volume(struct ocfs2_dinode *di, (unsigned long long)bh->b_blocknr); }else if (le32_to_cpu (di->id2.i_super.s_clustersize_bits) <12 ||le32_to_cpu (di->id2.i_super.s_clustersize_bits) >20 ) { -mlog (ML_ERROR ,"bad cluster size found: %u\n" , -1 <<le32_to_cpu (di->id2.i_super.s_clustersize_bits)); +mlog (ML_ERROR ,"bad cluster size bit found: %u\n" , +le32_to_cpu (di->id2.i_super.s_clustersize_bits)); }else if (!le64_to_cpu (di->id2.i_super.s_root_blkno)) {mlog (ML_ERROR ,"bad root_blkno: 0\n" ); }else if (!le64_to_cpu (di->id2.i_super.s_system_dir_blkno)) {
Signature · 1 line
2.30.2
Quoted 11 lines · qasdev
This patch addresses a shift-out-of-bounds error in the
ocfs2_verify_volume()function, identified by UBSAN. The bug was triggered by an invalids_clustersize_bitsvalue (e.g., 1548), which caused the expression "1 <<le32_to_cpu(di->id2.i_super.s_clustersize_bits)" to exceed the limits of a 32-bit integer,
leading to an out-of-bounds shift.Reported-by syzbot <[email protected]>Tested-by syzbot <[email protected]>Signed-off-by Qasim Ijaz <[email protected]>
Looks fine.
Quoted 19 lines
--- fs/ocfs2/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/ocfs2/super.c +2
-2@@ -2357,8 +2357,8 @@ static int ocfs2_verify_volume(struct ocfs2_dinode *di, (unsigned long long)bh->b_blocknr); }else if (le32_to_cpu (di->id2.i_super.s_clustersize_bits) <12 ||le32_to_cpu (di->id2.i_super.s_clustersize_bits) >20 ) { -mlog (ML_ERROR ,"bad cluster size found: %u\n" , -1 <<le32_to_cpu (di->id2.i_super.s_clustersize_bits)); +mlog (ML_ERROR ,"bad cluster size bit found: %u\n" , +le32_to_cpu (di->id2.i_super.s_clustersize_bits)); }else if (!le64_to_cpu (di->id2.i_super.s_root_blkno)) {mlog (ML_ERROR ,"bad root_blkno: 0\n" ); }else if (!le64_to_cpu (di->id2.i_super.s_system_dir_blkno)) {