fs: gfs2: add validation checks for size of superblock
PATCH v2 1/1 fs: gfs2: add validation checks for size of superblock
In gfs2_check_sb(), no validation checks are performed with regards to the size of the superblock.
syzkaller detected a slab-out-of-bounds bug that was primarily caused because the block size for a superblock was set to zero.
A valid size for a superblock is a power of 2 between 512 and PAGE_SIZE. Performing validation checks and ensuring that the size of the superblock is valid fixes this bug.
---
Changes in v2:
* Completely dropped the changes proposed in v1. Instead, validity checks for superblock size have been introduced. (Suggested by Andrew Price<[email protected]>)
* Addded a "Suggested-by" tag accrediting the patch idea to Andrew. If there's any issue with that, please let me know.
* Changed the commit header and commit message appropriately.
* Updated "Reported-by" and "Tested-by" tags to the same instance of the bug that was detected earlier (non consequential change).
fs/gfs2/ops_fstype.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/gfs2/ops_fstype.c +7 -0
@@ -169,6 +169,13 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)return -EINVAL ; } +/* Check if the size of the block is valid - a power of 2 between 512 and PAGE_SIZE */ +if (sb->sb_bsize <512 || sb->sb_bsize >PAGE_SIZE || (sb->sb_bsize & (sb->sb_bsize -1 ))) { +if (!silent) +pr_warn ("Invalid superblock size\n" ); +return -EINVAL ; + } +/* If format numbers match exactly, we're done. */ if (sb->sb_fs_format == GFS2_FORMAT_FS &&
Signature · 1 line
2.25.1
Andreas Gruenbacher
maintainerAnant,
Quoted 37 lines · Anant Thazhemadam
In
gfs2_check_sb(), no validation checks are performed with regards to the size of the superblock.
syzkaller detected a slab-out-of-bounds bug that was primarily caused because the block size for a superblock was set to zero.
A valid size for a superblock is a power of 2 between 512 andPAGE_SIZE. Performing validation checks and ensuring that the size of the superblock is valid fixes this bug.Reported-by syzbot+af90d47a37376844e731 at syzkaller.appspotmail.comTested-by syzbot+af90d47a37376844e731 at syzkaller.appspotmail.comSuggested-by Andrew Price <[email protected]>Signed-off-by Anant Thazhemadam <[email protected]>---
Changes in v2:
* Completely dropped the changes proposed in v1. Instead, validity checks for superblock size have been introduced. (Suggested by Andrew Price<[email protected]>)
* Addded a "Suggested-by" tag accrediting the patch idea to Andrew. If there's any issue with that, please let me know.
* Changed the commit header and commit message appropriately.
* Updated "Reported-by" and "Tested-by" tags to the same instance of the bug that was detected earlier (non consequential change).
fs/gfs2/ops_fstype.c | 7 +++++++ 1 file changed, 7 insertions(+)fs/gfs2/ops_fstype.c +0
-0
fs/gfs2/ops_fstype.c static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent) · line 178
Quoted 10 lines
fs/gfs2/ops_fstype.c +7
-0@@ -169,6 +169,13 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)return -EINVAL ; } +/* Check if the size of the block is valid - a power of 2 between 512 and PAGE_SIZE */ +if (sb->sb_bsize <512 || sb->sb_bsize >PAGE_SIZE || (sb->sb_bsize & (sb->sb_bsize -1 ))) { +if (!silent) +pr_warn ("Invalid superblock size\n" ); +return -EINVAL ; + } +
I'll add that to for-next.
Thanks,
Andreas