summaryrefslogtreecommitdiffstats
path: root/fs/quota
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2009-12-21 21:57:04 +0100
committerJan Kara <jack@suse.cz>2009-12-23 13:44:13 +0100
commit869835dfad3eb6f7d90c3255a24b084fea82f30d (patch)
tree738e438bcbab1330e8585ad6ee59dd8a66263a2c /fs/quota
parentjbd: jbd-debug and jbd2-debug should be writable (diff)
downloadlinux-869835dfad3eb6f7d90c3255a24b084fea82f30d.tar.xz
linux-869835dfad3eb6f7d90c3255a24b084fea82f30d.zip
quota: Improve checking of quota file header
When we are asked for vfsv0 quota format and the file is in vfsv1 format (or vice versa), refuse to use the quota file. Also return with error when we don't like the header of quota file. Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/quota')
-rw-r--r--fs/quota/quota_v2.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c
index 669855cf9b61..e3da02f4986f 100644
--- a/fs/quota/quota_v2.c
+++ b/fs/quota/quota_v2.c
@@ -97,8 +97,11 @@ static int v2_read_file_info(struct super_block *sb, int type)
unsigned int version;
if (!v2_read_header(sb, type, &dqhead))
- return 0;
+ return -1;
version = le32_to_cpu(dqhead.dqh_version);
+ if ((info->dqi_fmt_id == QFMT_VFS_V0 && version != 0) ||
+ (info->dqi_fmt_id == QFMT_VFS_V1 && version != 1))
+ return -1;
size = sb->s_op->quota_read(sb, type, (char *)&dinfo,
sizeof(struct v2_disk_dqinfo), V2_DQINFOOFF);