Commit 393551e9 authored by Eric W. Biederman's avatar Eric W. Biederman

gfs2: Remove improper checks in gfs2_set_dqblk.

In set_dqblk it is an error to look at fdq->d_id or fdq->d_flags.
Userspace quota applications do not set these fields when calling
quotactl(Q_XSETQLIM,...), and the kernel does not set those fields
when quota_setquota calls set_dqblk.

gfs2 never looks at fdq->d_id or fdq->d_flags after checking
to see if they match the id and type supplied to set_dqblk.

No other linux filesystem in set_dqblk looks at either fdq->d_id
or fdq->d_flags.

Therefore remove these bogus checks from gfs2 and allow normal
quota setting applications to work.

Cc: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent ecb528e3
...@@ -1543,13 +1543,9 @@ static int gfs2_set_dqblk(struct super_block *sb, struct kqid qid, ...@@ -1543,13 +1543,9 @@ static int gfs2_set_dqblk(struct super_block *sb, struct kqid qid,
switch(qid.type) { switch(qid.type) {
case USRQUOTA: case USRQUOTA:
type = QUOTA_USER; type = QUOTA_USER;
if (fdq->d_flags != FS_USER_QUOTA)
return -EINVAL;
break; break;
case GRPQUOTA: case GRPQUOTA:
type = QUOTA_GROUP; type = QUOTA_GROUP;
if (fdq->d_flags != FS_GROUP_QUOTA)
return -EINVAL;
break; break;
default: default:
return -EINVAL; return -EINVAL;
...@@ -1557,8 +1553,6 @@ static int gfs2_set_dqblk(struct super_block *sb, struct kqid qid, ...@@ -1557,8 +1553,6 @@ static int gfs2_set_dqblk(struct super_block *sb, struct kqid qid,
if (fdq->d_fieldmask & ~GFS2_FIELDMASK) if (fdq->d_fieldmask & ~GFS2_FIELDMASK)
return -EINVAL; return -EINVAL;
if (fdq->d_id != from_kqid(&init_user_ns, qid))
return -EINVAL;
error = qd_get(sdp, type, from_kqid(&init_user_ns, qid), &qd); error = qd_get(sdp, type, from_kqid(&init_user_ns, qid), &qd);
if (error) if (error)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment