On Wednesday, January 29, 2020 10:33 PM Christoph Hellwig wrote: > Lift the flags and bufsize checks from both callers into the common code > in xfs_ioc_attr_list. > Logically, code flow remains the same. Reviewed-by: Chandan Rajendra <chandanrlinux@xxxxxxxxx> > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > --- > fs/xfs/xfs_ioctl.c | 23 ++++++++++++----------- > fs/xfs/xfs_ioctl32.c | 11 ----------- > 2 files changed, 12 insertions(+), 22 deletions(-) > > diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c > index 0f9326bc055c..c8814808a551 100644 > --- a/fs/xfs/xfs_ioctl.c > +++ b/fs/xfs/xfs_ioctl.c > @@ -360,6 +360,18 @@ xfs_ioc_attr_list( > struct xfs_attrlist *alist; > int error; > > + if (bufsize < sizeof(struct xfs_attrlist) || > + bufsize > XFS_XATTR_LIST_MAX) > + return -EINVAL; > + > + /* > + * Reject flags, only allow namespaces. > + */ > + if (flags & ~(ATTR_ROOT | ATTR_SECURE)) > + return -EINVAL; > + if (flags == (ATTR_ROOT | ATTR_SECURE)) > + return -EINVAL; > + > /* > * Validate the cursor. > */ > @@ -414,17 +426,6 @@ xfs_attrlist_by_handle( > return -EPERM; > if (copy_from_user(&al_hreq, arg, sizeof(xfs_fsop_attrlist_handlereq_t))) > return -EFAULT; > - if (al_hreq.buflen < sizeof(struct xfs_attrlist) || > - al_hreq.buflen > XFS_XATTR_LIST_MAX) > - return -EINVAL; > - > - /* > - * Reject flags, only allow namespaces. > - */ > - if (al_hreq.flags & ~(ATTR_ROOT | ATTR_SECURE)) > - return -EINVAL; > - if (al_hreq.flags == (ATTR_ROOT | ATTR_SECURE)) > - return -EINVAL; > > dentry = xfs_handlereq_to_dentry(parfilp, &al_hreq.hreq); > if (IS_ERR(dentry)) > diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c > index 10ea0222954c..840d17951407 100644 > --- a/fs/xfs/xfs_ioctl32.c > +++ b/fs/xfs/xfs_ioctl32.c > @@ -366,17 +366,6 @@ xfs_compat_attrlist_by_handle( > if (copy_from_user(&al_hreq, arg, > sizeof(compat_xfs_fsop_attrlist_handlereq_t))) > return -EFAULT; > - if (al_hreq.buflen < sizeof(struct xfs_attrlist) || > - al_hreq.buflen > XFS_XATTR_LIST_MAX) > - return -EINVAL; > - > - /* > - * Reject flags, only allow namespaces. > - */ > - if (al_hreq.flags & ~(ATTR_ROOT | ATTR_SECURE)) > - return -EINVAL; > - if (al_hreq.flags == (ATTR_ROOT | ATTR_SECURE)) > - return -EINVAL; > > dentry = xfs_compat_handlereq_to_dentry(parfilp, &al_hreq.hreq); > if (IS_ERR(dentry)) > -- chandan
