From: Wang Shilong <wshilong@ddn.com>
Date: Tue, 3 Aug 2021 16:48:04 +0000 (-0700)
Subject: fs: forbid invalid project ID
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d03ef4daf33a33da8d7c397102fff8ae87d04a93;p=linux.git

fs: forbid invalid project ID

fileattr_set_prepare() should check if project ID
is valid, otherwise dqget() will return NULL for
such project ID quota.

Signed-off-by: Wang Shilong <wshilong@ddn.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 1e2204fa9963e..d4fabb5421cd3 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -817,6 +817,14 @@ static int fileattr_set_prepare(struct inode *inode,
 		if ((old_ma->fsx_xflags ^ fa->fsx_xflags) &
 				FS_XFLAG_PROJINHERIT)
 			return -EINVAL;
+	} else {
+		/*
+		 * Caller is allowed to change the project ID. If it is being
+		 * changed, make sure that the new value is valid.
+		 */
+		if (old_ma->fsx_projid != fa->fsx_projid &&
+		    !projid_valid(make_kprojid(&init_user_ns, fa->fsx_projid)))
+			return -EINVAL;
 	}
 
 	/* Check extent size hints. */