On Tue, Mar 29, 2016 at 06:11:43PM +0200, Jan Kara wrote:
> Currently we oopsed when Q_GETNEXTQUOTA got called when quota was
> disabled. Properly check whether quota is enabled for the filesystem
> before calling into quota format handler.
>
> diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
> index ba827daea5a0..ff21980d0119 100644
> --- a/fs/quota/dquot.c
> +++ b/fs/quota/dquot.c
> @@ -2047,11 +2047,20 @@ int dquot_get_next_id(struct super_block *sb, struct kqid *qid)
> struct quota_info *dqopt = sb_dqopt(sb);
> int err;
>
> - if (!dqopt->ops[qid->type]->get_next_id)
> - return -ENOSYS;
> + mutex_lock(&dqopt->dqonoff_mutex);
> + if (!sb_has_quota_active(sb, qid->type)) {
> + err = -ESRCH;
> + goto out;
> + }
> + if (!dqopt->ops[qid->type]->get_next_id) {
> + err = -ENOSYS;
> + goto out;
> + }
Don't you also have to test if dqopt->ops[qid->type] is NULL? e.g.,
if the quota inode hasn't been loaded for that quota type?
Also, I notice you have this queued on the for_next branch and not the
for_linus branch. I was hoping you could push this to Linus sooner
than the next merge cycle, since this is (a) making my testing hard,
and (b) it makes it easy for an attacker to crash the system. For
similar reasons, perhaps this should have a cc: stable@xxxxxxxxxxxxxxx
tag?
Thanks,
- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
