Merge tag 'amd-drm-fixes-5.6-2020-02-19' of git://people.freedesktop.org/~agd5f/linux...

[linux.git] / fs / xfs / xfs_ioctl32.c

diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index c4c4f09113d3c48e8cef1a7b9016a207949f76ad..769581a79c5885105524f121f93f2207ac4eb15f 100644 (file)
--- a/fs/xfs/xfs_ioctl32.c
+++ b/fs/xfs/xfs_ioctl32.c
@@ -107,7 +107,7 @@ xfs_ioctl32_bstime_copyin(
        xfs_bstime_t            *bstime,
        compat_xfs_bstime_t     __user *bstime32)
 {
-       compat_time_t           sec32;  /* tv_sec differs on 64 vs. 32 */
+       old_time32_t            sec32;  /* tv_sec differs on 64 vs. 32 */
 
        if (get_user(sec32,             &bstime32->tv_sec)      ||
            get_user(bstime->tv_nsec,   &bstime32->tv_nsec))
@@ -450,6 +450,13 @@ xfs_compat_attrmulti_by_handle(
 
        error = 0;
        for (i = 0; i < am_hreq.opcount; i++) {
+               if ((ops[i].am_flags & ATTR_ROOT) &&
+                   (ops[i].am_flags & ATTR_SECURE)) {
+                       ops[i].am_error = -EINVAL;
+                       continue;
+               }
+               ops[i].am_flags &= ~ATTR_KERNEL_FLAGS;
+
                ops[i].am_error = strncpy_from_user((char *)attr_name,
                                compat_ptr(ops[i].am_attrname),
                                MAXNAMELEN);