summary refs log tree commit diff
path: root/fs/ioctl.c
diff options
context:
space:
mode:
authorWang Shilong <wshilong@ddn.com>2021-08-03 09:48:04 -0700
committerDarrick J. Wong <djwong@kernel.org>2021-08-03 09:48:04 -0700
commitd03ef4daf33a33da8d7c397102fff8ae87d04a93 (patch)
tree614e976e80a57628a77d7f86d6bef566f84dc082 /fs/ioctl.c
parentc500bee1c5b2f1d59b1081ac879d73268ab0ff17 (diff)
downloadlinux-d03ef4daf33a33da8d7c397102fff8ae87d04a93.tar.gz
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>
Diffstat (limited to 'fs/ioctl.c')
-rw-r--r--fs/ioctl.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/ioctl.c b/fs/ioctl.c
index 1e2204fa9963..d4fabb5421cd 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. */