From: Jan Kara <jack@suse.cz>
Date: Mon, 21 Dec 2009 20:57:04 +0000 (+0100)
Subject: quota: Improve checking of quota file header
X-Git-Tag: v2.6.33-rc2~18^2
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=869835dfad3eb6f7d90c3255a24b084fea82f30d;p=net-next-2.6.git

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>
---

diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c
index 669855cf9b6..e3da02f4986 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);