diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-10-12 18:38:25 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-10-12 18:38:25 +1100 |
| commit | 1e2103cbf4adfd5490ee5f3ee59750bd70d2047e (patch) | |
| tree | fb8256698fc1098784ef0bedba22768a793679f4 /fs/xfs/xfs_ioctl.c | |
| parent | 8a56d7c305b9613dfe416fd1af06871ec34bb103 (diff) | |
| parent | 847f9f6875fb02b576035e3dc31f5e647b7617a7 (diff) | |
Merge branch 'xfs-misc-fixes-for-4.4-1' into for-next
Diffstat (limited to 'fs/xfs/xfs_ioctl.c')
| -rw-r--r-- | fs/xfs/xfs_ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index b67a130134fb..c88ddcadd656 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -411,7 +411,7 @@ xfs_attrlist_by_handle( if (copy_from_user(&al_hreq, arg, sizeof(xfs_fsop_attrlist_handlereq_t))) return -EFAULT; if (al_hreq.buflen < sizeof(struct attrlist) || - al_hreq.buflen > XATTR_LIST_MAX) + al_hreq.buflen > XFS_XATTR_LIST_MAX) return -EINVAL; /* @@ -455,7 +455,7 @@ xfs_attrmulti_attr_get( unsigned char *kbuf; int error = -EFAULT; - if (*len > XATTR_SIZE_MAX) + if (*len > XFS_XATTR_SIZE_MAX) return -EINVAL; kbuf = kmem_zalloc_large(*len, KM_SLEEP); if (!kbuf) @@ -485,7 +485,7 @@ xfs_attrmulti_attr_set( if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; - if (len > XATTR_SIZE_MAX) + if (len > XFS_XATTR_SIZE_MAX) return -EINVAL; kbuf = memdup_user(ubuf, len); |