| From d47876eb848178230837adf184487f90999eb8b5 Mon Sep 17 00:00:00 2001 |
| From: Jan Kara <jack@suse.cz> |
| Date: Wed, 23 Oct 2019 17:00:45 -0700 |
| Subject: [PATCH] xfs: Sanity check flags of Q_XQUOTARM call |
| |
| commit 3dd4d40b420846dd35869ccc8f8627feef2cff32 upstream. |
| |
| Flags passed to Q_XQUOTARM were not sanity checked for invalid values. |
| Fix that. |
| |
| Fixes: 9da93f9b7cdf ("xfs: fix Q_XQUOTARM ioctl") |
| Reported-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com> |
| Signed-off-by: Jan Kara <jack@suse.cz> |
| Reviewed-by: Eric Sandeen <sandeen@redhat.com> |
| Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> |
| Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c |
| index a7c0c657dfaf..13ca7c16bfc7 100644 |
| --- a/fs/xfs/xfs_quotaops.c |
| +++ b/fs/xfs/xfs_quotaops.c |
| @@ -202,6 +202,9 @@ xfs_fs_rm_xquota( |
| if (XFS_IS_QUOTA_ON(mp)) |
| return -EINVAL; |
| |
| + if (uflags & ~(FS_USER_QUOTA | FS_GROUP_QUOTA | FS_PROJ_QUOTA)) |
| + return -EINVAL; |
| + |
| if (uflags & FS_USER_QUOTA) |
| flags |= XFS_DQ_USER; |
| if (uflags & FS_GROUP_QUOTA) |
| -- |
| 2.7.4 |
| |