Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Chengguang Xu <cgxu519@mykernel.net>
To:     jack@suse.com
Cc:     linux-kernel@vger.kernel.org, Chengguang Xu <cgxu519@mykernel.net>
Message-ID: <20191008145059.21402-1-cgxu519@mykernel.net>
Subject: [PATCH] quota: check quota type in early stage
Date:   Tue,  8 Oct 2019 22:50:59 +0800
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf8
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Check quota type in early stage so we can avoid many
unncessary operations when the type is wrong.

Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
---
 fs/quota/quota.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index cb13fb76dbee..5444d3c4d93f 100644
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -60,8 +60,6 @@ static int quota_sync_all(int type)
 {
 =09int ret;
=20
-=09if (type >=3D MAXQUOTAS)
-=09=09return -EINVAL;
 =09ret =3D security_quotactl(Q_SYNC, type, 0, NULL);
 =09if (!ret)
 =09=09iterate_supers(quota_sync_one, &type);
@@ -686,8 +684,6 @@ static int do_quotactl(struct super_block *sb, int type=
, int cmd, qid_t id,
 {
 =09int ret;
=20
-=09if (type >=3D MAXQUOTAS)
-=09=09return -EINVAL;
 =09type =3D array_index_nospec(type, MAXQUOTAS);
 =09/*
 =09 * Quota not supported on this fs? Check this before s_quota_types
@@ -831,6 +827,9 @@ int kernel_quotactl(unsigned int cmd, const char __user=
 *special,
 =09cmds =3D cmd >> SUBCMDSHIFT;
 =09type =3D cmd & SUBCMDMASK;
=20
+=09if (type >=3D MAXQUOTAS)
+=09=09return -EINVAL;
+
 =09/*
 =09 * As a special case Q_SYNC can be called without a specific device.
 =09 * It will iterate all superblocks that have quota enabled and call
--=20
2.21.0