ocfs2: Fix incorrect CPU endianness conversion causing mount failure
Heming Zhao
reviewerPATCH 1/1 ocfs2: Fix incorrect CPU endianness conversion causing mount failure
Commit 23aab037106d ("ocfs2: fix UBSAN warning in ocfs2_verify_volume()") introduced a regression bug. The blksz_bits value is already converted to CPU endian in the previous code; therefore, the code shouldn't use le32_to_cpu() anymore.
Fixes 23aab037106d ("ocfs2: fix UBSAN warning in ocfs2_verify_volume()")
Signed-off-by Heming Zhao <[email protected]>
--- fs/ocfs2/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/super.c +1 -1
@@ -2340,7 +2340,7 @@ static int ocfs2_verify_volume(struct ocfs2_dinode *di,mlog (ML_ERROR ,"found superblock with incorrect block " "size bits: found %u, should be 9, 10, 11, or 12\n" , blksz_bits); - }else if ((1 <<le32_to_cpu (blksz_bits)) != blksz) { + }else if ((1 << blksz_bits) != blksz) {mlog (ML_ERROR ,"found superblock with incorrect block " "size: found %u, should be %u\n" ,1 << blksz_bits, blksz); } else if (le16_to_cpu(di->id2.i_super.s_major_rev_level) !=
Signature · 1 line
2.43.0
Quoted 7 lines · Heming Zhao
Commit
23aab037106d("ocfs2: fix UBSAN warning inocfs2_verify_volume()") introduced a regression bug. Theblksz_bitsvalue is already converted to CPU endian in the previous code; therefore, the code shouldn't usele32_to_cpu()anymore.Fixes 23aab037106d ("ocfs2: fix UBSAN warning in ocfs2_verify_volume()")Signed-off-by Heming Zhao <[email protected]>
Thanks for pointing out this issue.
Reviewed-by Joseph Qi <[email protected]>
Quoted 17 lines
--- fs/ocfs2/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/ocfs2/super.c +1
-1@@ -2340,7 +2340,7 @@ static int ocfs2_verify_volume(struct ocfs2_dinode *di,mlog (ML_ERROR ,"found superblock with incorrect block " "size bits: found %u, should be 9, 10, 11, or 12\n" , blksz_bits); - }else if ((1 <<le32_to_cpu (blksz_bits)) != blksz) { + }else if ((1 << blksz_bits) != blksz) {mlog (ML_ERROR ,"found superblock with incorrect block " "size: found %u, should be %u\n" ,1 << blksz_bits, blksz); } else if (le16_to_cpu(di->id2.i_super.s_major_rev_level) !=