hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xfs: bulkstat should copy lastip whenever userspace supplies one 

When userspace passes in a @lastip pointer we should copy the results
back, even if the @ocount pointer is NULL.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
This commit is contained in:
Darrick J. Wong 2019-07-02 09:39:39 -07:00
parent ebd126a651
commit f16fe3ecde
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/xfs/xfs_ioctl.c
View File

@ -759,14 +759,13 @@ xfs_ioc_bulkstat(
if (error) if (error)
return error; return error;
if (bulkreq.ocount != NULL) { if (bulkreq.lastip != NULL &&
if (copy_to_user(bulkreq.lastip, &inlast, copy_to_user(bulkreq.lastip, &inlast, sizeof(xfs_ino_t)))
sizeof(xfs_ino_t)))
return -EFAULT; return -EFAULT;
if (copy_to_user(bulkreq.ocount, &count, sizeof(count))) if (bulkreq.ocount != NULL &&
copy_to_user(bulkreq.ocount, &count, sizeof(count)))
return -EFAULT; return -EFAULT;
}
return 0; return 0;
} }

9
fs/xfs/xfs_ioctl32.c
View File

@ -305,14 +305,13 @@ xfs_compat_ioc_bulkstat(
if (error) if (error)
return error; return error;
if (bulkreq.ocount != NULL) { if (bulkreq.lastip != NULL &&
if (copy_to_user(bulkreq.lastip, &inlast, copy_to_user(bulkreq.lastip, &inlast, sizeof(xfs_ino_t)))
sizeof(xfs_ino_t)))
return -EFAULT; return -EFAULT;
if (copy_to_user(bulkreq.ocount, &count, sizeof(count))) if (bulkreq.ocount != NULL &&
copy_to_user(bulkreq.ocount, &count, sizeof(count)))
return -EFAULT; return -EFAULT;
}
return 0; return 0;
} }