cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 16/25] quota: Verify flags passed to Q_SETINFO
Date: Thu, 18 Dec 2014 16:37:30 +0100	[thread overview]
Message-ID: <1418917059-23870-17-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1418917059-23870-1-git-send-email-jack@suse.cz>

Currently flags passed via Q_SETINFO were just stored. This makes it
hard to add new flags since in theory userspace could be just setting /
clearing random flags. Since currently there is only one userspace
settable flag and that is somewhat obscure flags only for ancient v1
quota format, I'm reasonably sure noone operates these flags and
hopefully we are fine just adding the check that passed flags are sane.
If we indeed find some userspace program that gets broken by the strict
check, we can always remove it again.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/quota/dquot.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index a6b5795a4181..02d571cb010a 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2649,6 +2649,14 @@ int dquot_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
 		goto out;
 	}
 	mi = sb_dqopt(sb)->info + type;
+	if (ii->dqi_valid & IIF_FLAGS) {
+		if (ii->dqi_flags & ~DQF_SETINFO_MASK ||
+		    (ii->dqi_flags & DQF_ROOT_SQUASH &&
+		     mi->dqi_format->qf_fmt_id != QFMT_VFS_OLD)) {
+			err = -EINVAL;
+			goto out;
+		}
+	}
 	spin_lock(&dq_data_lock);
 	if (ii->dqi_valid & IIF_BGRACE)
 		mi->dqi_bgrace = ii->dqi_bgrace;
-- 
1.8.4.5



  parent reply	other threads:[~2014-12-18 15:37 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-18 15:37 [Cluster-devel] [PATCH 0/25 RFC v2] quota: Unify VFS and XFS quota interfaces Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 01/25] xfs: Remove useless test Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 02/25] xfs: Remove unused variable in xfs_qm_scall_quotaon() Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 03/25] xfs: Remove some useless flags tests Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 04/25] quota: Split ->set_xstate callback into two Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 05/25] quota: Wire up ->quota_{enable, disable} callbacks into Q_QUOTA{ON, OFF} Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 06/25] quota: Add ->quota_{enable, disable} callbacks for VFS quotas Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 07/25] ext4: Use generic helpers for quotaon and quotaoff Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 08/25] ocfs2: " Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 09/25] quota: Remove quota_on_meta callback Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 10/25] quota: Switch ->get_dqblk() and ->set_dqblk() to use bytes as space units Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 11/25] quota: Store maximum space limit in bytes Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 12/25] quota: Make Q_XQUOTASYNC support VFS quota syncing Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 13/25] quota: Don't store flags for v2 quota format Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 14/25] ocfs2: Move OLQF_CLEAN flag out of generic quota flags Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 15/25] quota: Cleanup flags definitions Jan Kara
2014-12-18 15:37 ` Jan Kara [this message]
2014-12-18 15:37 ` [Cluster-devel] [PATCH 17/25] quota: Make VFS quotas use new interface for getting quota info Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 18/25] quota: Wire up Q_GETXSTATE and Q_GETXSTATV calls to work with ->get_state Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 19/25] xfs: Remove some pointless quota checks Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 20/25] xfs: Convert to using ->get_state callback Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 21/25] gfs2: " Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 22/25] quota: Remove ->get_xstate and ->get_xstatev callbacks Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 23/25] quota: Make ->set_info use structure with neccesary info to VFS and XFS Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 24/25] xfs: Add support for Q_SETINFO Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 25/25] quota: Hook up Q_XSETQLIM for id 0 to ->set_info Jan Kara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1418917059-23870-17-git-send-email-jack@suse.cz \
    --to=jack@suse.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).