diff options
| author | Niu Yawei <yawei.niu@gmail.com> | 2014-06-04 12:19:12 +0800 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2014-07-15 22:40:20 +0200 |
| commit | 606cdcca04a609ed4dfbfe788942de9477da556b (patch) | |
| tree | 39ab3998af17cd911ce086e02dc2a6f2199a158b /fs/quota | |
| parent | d68aab6b8f572406aa93b45ef6483934dd3b54a6 (diff) | |
| download | linux-0-day-606cdcca04a609ed4dfbfe788942de9477da556b.tar.gz linux-0-day-606cdcca04a609ed4dfbfe788942de9477da556b.tar.xz | |
quota: protect Q_GETFMT by dqonoff_mutex
dqptr_sem will go away. Protect Q_GETFMT quotactl by
dqonoff_mutex instead. This is also enough to make sure
quota info will not go away while we are looking at it.
Signed-off-by: Lai Siyao <lai.siyao@intel.com>
Signed-off-by: Niu Yawei <yawei.niu@intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/quota')
| -rw-r--r-- | fs/quota/quota.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/quota/quota.c b/fs/quota/quota.c index ff3f0b3cfdb31..75621649dbd76 100644 --- a/fs/quota/quota.c +++ b/fs/quota/quota.c @@ -79,13 +79,13 @@ static int quota_getfmt(struct super_block *sb, int type, void __user *addr) { __u32 fmt; - down_read(&sb_dqopt(sb)->dqptr_sem); + mutex_lock(&sb_dqopt(sb)->dqonoff_mutex); if (!sb_has_quota_active(sb, type)) { - up_read(&sb_dqopt(sb)->dqptr_sem); + mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex); return -ESRCH; } fmt = sb_dqopt(sb)->info[type].dqi_format->qf_fmt_id; - up_read(&sb_dqopt(sb)->dqptr_sem); + mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex); if (copy_to_user(addr, &fmt, sizeof(fmt))) return -EFAULT; return 0; |