quota: Handle corrupted quota file better
Subsystems (3)
Jan Kara
reviewercover quota: Handle corrupted quota file better
Hello,
syzbot has spotted that quota code does not handle corrupted quota files quite well. Let's add some sanity checks to avoid kernel crashes when accessing corrupted quota files.
Honza
Jan Kara
reviewerPATCH 1/2 quota: Don't overflow quota file offsets
The on-disk quota format supports quota files with upto 2^32 blocks. Be careful when computing quota file offsets in the quota files from block numbers as they can overflow 32-bit types. Since quota files larger than 4GB would require ~26 millions of quota users, this is mostly a theoretical concern now but better be careful, fuzzers would find the problem sooner or later anyway...
--- fs/quota/quota_tree.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/quota/quota_tree.c +4 -4
@@ -62,7 +62,7 @@ static ssize_t read_blk(struct qtree_mem_dqinfo *info, uint blk, char *buf)memset (buf,0 , info->dqi_usable_bs);return sb->s_op->quota_read (sb, info->dqi_type, buf, - info->dqi_usable_bs, blk << info->dqi_blocksize_bits); + info->dqi_usable_bs, (loff_t )blk << info->dqi_blocksize_bits); }static ssize_t write_blk (struct qtree_mem_dqinfo *info,uint blk,char *buf)
@@ -71,7 +71,7 @@ static ssize_t write_blk(struct qtree_mem_dqinfo *info, uint blk, char *buf)ssize_t ret; ret = sb->s_op->quota_write (sb, info->dqi_type, buf, - info->dqi_usable_bs, blk << info->dqi_blocksize_bits); + info->dqi_usable_bs, (loff_t )blk << info->dqi_blocksize_bits);if (ret != info->dqi_usable_bs) {quota_error (sb,"dquota write failed" );if (ret >=0 )
@@ -284,7 +284,7 @@ static uint find_free_dqentry(struct qtree_mem_dqinfo *info, blk); goto out_buf; } - dquot->dq_off = (blk << info->dqi_blocksize_bits) + + dquot->dq_off = ((loff_t )blk << info->dqi_blocksize_bits) +sizeof (struct qt_disk_dqdbheader ) + i * info->dqi_entry_size;kfree (buf);
@@ -559,7 +559,7 @@ static loff_t find_block_dqentry(struct qtree_mem_dqinfo *info, ret = -EIO ; goto out_buf; }else { - ret = (blk << info->dqi_blocksize_bits) +sizeof (struct + ret = ((loff_t )blk << info->dqi_blocksize_bits) +sizeof (struct qt_disk_dqdbheader ) + i * info->dqi_entry_size; } out_buf:
Signature · 1 line
2.16.4
Re: [PATCH 1/2] quota: Don't overflow quota file offsets
Quoted 9 lines · Jan Kara
The on-disk quota format supports quota files with upto 2^32 blocks. Be careful when computing quota file offsets in the quota files from block numbers as they can overflow 32-bit types. Since quota files larger than 4GB would require ~26 millions of quota users, this is mostly a theoretical concern now but better be careful, fuzzers would find the problem sooner or later anyway...
Signed-off-by Jan Kara <[email protected]>
Out of curiosity, is this 26 million *quota entries*, or is it just a UID larger than 26M? At one point the quota files were sparse and indexed by the UID, but I guess very file name "quota tree" means this is not correct. Is there some document/comment that describes the on-disk quota file format?
In any case, the change makes sense regardless, since ->quota_read() takes loff_t for the offset.
Quoted 43 lines
---
fs/quota/quota_tree.c| 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)fs/quota/quota_tree.c +4
-4@@ -62,7 +62,7 @@ static ssize_t read_blk(struct qtree_mem_dqinfo *info, uint blk, char *buf)memset (buf,0 , info->dqi_usable_bs);return sb->s_op->quota_read (sb, info->dqi_type, buf, - info->dqi_usable_bs, blk << info->dqi_blocksize_bits); + info->dqi_usable_bs, (loff_t )blk << info->dqi_blocksize_bits); }static ssize_t write_blk (struct qtree_mem_dqinfo *info,uint blk,char *buf)@@ -71,7 +71,7 @@ static ssize_t write_blk(struct qtree_mem_dqinfo *info, uint blk, char *buf)ssize_t ret; ret = sb->s_op->quota_write (sb, info->dqi_type, buf, - info->dqi_usable_bs, blk << info->dqi_blocksize_bits); + info->dqi_usable_bs, (loff_t )blk << info->dqi_blocksize_bits);if (ret != info->dqi_usable_bs) {quota_error (sb,"dquota write failed" );if (ret >=0 )@@ -284,7 +284,7 @@ static uint find_free_dqentry(struct qtree_mem_dqinfo *info, blk); goto out_buf; } - dquot->dq_off = (blk << info->dqi_blocksize_bits) + + dquot->dq_off = ((loff_t )blk << info->dqi_blocksize_bits) +sizeof (struct qt_disk_dqdbheader ) + i * info->dqi_entry_size;kfree (buf);@@ -559,7 +559,7 @@ static loff_t find_block_dqentry(struct qtree_mem_dqinfo *info, ret = -EIO ; goto out_buf; }else { - ret = (blk << info->dqi_blocksize_bits) +sizeof (struct + ret = ((loff_t )blk << info->dqi_blocksize_bits) +sizeof (struct qt_disk_dqdbheader ) + i * info->dqi_entry_size; }
Quoted 4 lines
out_buf:
--
2.16.4
Cheers, Andreas
Jan Kara
reviewerRe: [PATCH 1/2] quota: Don't overflow quota file offsets
Quoted 9 lines · Andreas Dilger
Quoted 8 lines · Jan Kara
The on-disk quota format supports quota files with upto 2^32 blocks. Be careful when computing quota file offsets in the quota files from block numbers as they can overflow 32-bit types. Since quota files larger than 4GB would require ~26 millions of quota users, this is mostly a theoretical concern now but better be careful, fuzzers would find the problem sooner or later anyway...
Quoted 6 lines
Quoted 1 line
Signed-off-by Jan Kara <[email protected]>Out of curiosity, is this 26 million *quota entries*, or is it just a UID larger than 26M? At one point the quota files were sparse and indexed by the UID, but I guess very file name "quota tree" means this is not correct. Is there some document/comment that describes the on-disk quota file format?
It is really 26M different UIDs/GIDs/ProjectIDs. The sparse file format you describe is the original quota format (implemented by fs/quota/quota_v1.c) that the current format superseeded sometime in 1999 or so ;). The current format uses radix tree for structure lookup and then structures are just stored in a linear array. There's documentation of the format in quota-tools in doc/quotadoc.sgml.
Quoted 4 lines
In any case, the change makes sense regardless, since ->quota_read() takes
loff_tfor the offset.Reviewed-by Andreas Dilger <[email protected]>
Thanks!
Honza
Quoted 56 lines
Quoted 44 lines
---
fs/quota/quota_tree.c| 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)fs/quota/quota_tree.c +4
-4@@ -62,7 +62,7 @@ static ssize_t read_blk(struct qtree_mem_dqinfo *info, uint blk, char *buf)memset (buf,0 , info->dqi_usable_bs);return sb->s_op->quota_read (sb, info->dqi_type, buf, - info->dqi_usable_bs, blk << info->dqi_blocksize_bits); + info->dqi_usable_bs, (loff_t )blk << info->dqi_blocksize_bits); }static ssize_t write_blk (struct qtree_mem_dqinfo *info,uint blk,char *buf)@@ -71,7 +71,7 @@ static ssize_t write_blk(struct qtree_mem_dqinfo *info, uint blk, char *buf)ssize_t ret; ret = sb->s_op->quota_write (sb, info->dqi_type, buf, - info->dqi_usable_bs, blk << info->dqi_blocksize_bits); + info->dqi_usable_bs, (loff_t )blk << info->dqi_blocksize_bits);if (ret != info->dqi_usable_bs) {quota_error (sb,"dquota write failed" );if (ret >=0 )@@ -284,7 +284,7 @@ static uint find_free_dqentry(struct qtree_mem_dqinfo *info, blk); goto out_buf; } - dquot->dq_off = (blk << info->dqi_blocksize_bits) + + dquot->dq_off = ((loff_t )blk << info->dqi_blocksize_bits) +sizeof (struct qt_disk_dqdbheader ) + i * info->dqi_entry_size;kfree (buf);@@ -559,7 +559,7 @@ static loff_t find_block_dqentry(struct qtree_mem_dqinfo *info, ret = -EIO ; goto out_buf; }else { - ret = (blk << info->dqi_blocksize_bits) +sizeof (struct + ret = ((loff_t )blk << info->dqi_blocksize_bits) +sizeof (struct qt_disk_dqdbheader ) + i * info->dqi_entry_size; }Quoted 4 lines
out_buf:
--
2.16.4Cheers, Andreas
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jan Kara
reviewerPATCH 2/2 quota: Sanity-check quota file headers on load
In reply to Jan KaraPerform basic sanity checks of quota headers to avoid kernel crashes on corrupted quota files.
--- fs/quota/quota_v2.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
fs/quota/quota_v2.c +19 -0
@@ -157,6 +157,25 @@ static int v2_read_file_info(struct super_block *sb, int type) qinfo->dqi_entry_size =sizeof (struct v2r1_disk_dqblk ); qinfo->dqi_ops = &v2r1_qtree_ops; } + ret = -EUCLEAN ; +/* Some sanity checks of the read headers... */ +if ((loff_t )qinfo->dqi_blocks << qinfo->dqi_blocksize_bits > +i_size_read (sb_dqopt (sb)->files[type])) { +quota_error (sb,"Number of blocks too big for quota file size (%llu > %llu)." , + (loff_t )qinfo->dqi_blocks << qinfo->dqi_blocksize_bits, +i_size_read (sb_dqopt (sb)->files[type])); + goto out; + } +if (qinfo->dqi_free_blk >= qinfo->dqi_blocks) { +quota_error (sb,"Free block number too big (%u >= %u)." , + qinfo->dqi_free_blk, qinfo->dqi_blocks); + goto out; + } +if (qinfo->dqi_free_entry >= qinfo->dqi_blocks) { +quota_error (sb,"Block with free entry too big (%u >= %u)." , + qinfo->dqi_free_entry, qinfo->dqi_blocks); + goto out; + } ret =0 ; out:up_read (&dqopt->dqio_sem);
Signature · 1 line
2.16.4
Re: [PATCH 2/2] quota: Sanity-check quota file headers on load
Quoted 7 lines · Jan Kara
Perform basic sanity checks of quota headers to avoid kernel crashes on corrupted quota files.
Looks reasonable.
Quoted 33 lines
---
fs/quota/quota_v2.c| 19 +++++++++++++++++++1 file changed, 19 insertions(+)fs/quota/quota_v2.c +19
-0@@ -157,6 +157,25 @@ static int v2_read_file_info(struct super_block *sb, int type) qinfo->dqi_entry_size =sizeof (struct v2r1_disk_dqblk ); qinfo->dqi_ops = &v2r1_qtree_ops; } + ret = -EUCLEAN ; +/* Some sanity checks of the read headers... */ +if ((loff_t )qinfo->dqi_blocks << qinfo->dqi_blocksize_bits > +i_size_read (sb_dqopt (sb)->files[type])) { +quota_error (sb,"Number of blocks too big for quota file size (%llu > %llu)." , + (loff_t )qinfo->dqi_blocks << qinfo->dqi_blocksize_bits, +i_size_read (sb_dqopt (sb)->files[type])); + goto out; + } +if (qinfo->dqi_free_blk >= qinfo->dqi_blocks) { +quota_error (sb,"Free block number too big (%u >= %u)." , + qinfo->dqi_free_blk, qinfo->dqi_blocks); + goto out; + } +if (qinfo->dqi_free_entry >= qinfo->dqi_blocks) { +quota_error (sb,"Block with free entry too big (%u >= %u)." , + qinfo->dqi_free_entry, qinfo->dqi_blocks); + goto out; + } ret =0 ;out:
Quoted 4 lines
up_read(&dqopt->dqio_sem);--
2.16.4
Cheers, Andreas