Commit c456d644 authored Dec 17, 2018 by Nick Bowler Committed by Darrick J. Wong Dec 18, 2018

xfs: Align compat attrlist_by_handle with native implementation.

While inspecting the ioctl implementations, I noticed that the compat
implementation of XFS_IOC_ATTRLIST_BY_HANDLE does not do exactly the
same thing as the native implementation. Specifically, the "cursor"
does not appear to be written out to userspace on the compat path,
like it is on the native path.

This adjusts the compat implementation to copy out the cursor just
like the native implementation does. The attrlist cursor does not
require any special compat handling. This fixes xfstests xfs/269
on both IA-32 and x32 userspace, when running on an amd64 kernel.

Signed-off-by: Nick Bowler <nbowler@draconx.ca>
Fixes: 0facef7f ("xfs: in _attrlist_by_handle, copy the cursor back to userspace")
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

parent 64bafd2f

fs/xfs/xfs_ioctl32.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -336,6 +336,7 @@ xfs_compat_attrlist_by_handle(
		{
		int error;
		attrlist_cursor_kern_t *cursor;
		compat_xfs_fsop_attrlist_handlereq_t __user *p = arg;
		compat_xfs_fsop_attrlist_handlereq_t al_hreq;
		struct dentry *dentry;
		char *kbuf;
		@@ -370,6 +371,11 @@ xfs_compat_attrlist_by_handle(
		if (error)
		goto out_kfree;

		if (copy_to_user(&p->pos, cursor, sizeof(attrlist_cursor_kern_t))) {
		error = -EFAULT;
		goto out_kfree;
		}

		if (copy_to_user(compat_ptr(al_hreq.buffer), kbuf, al_hreq.buflen))
		error = -EFAULT;

Admin message