Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e94fc4a4 authored by sandeen@sandeen.net's avatar sandeen@sandeen.net Committed by Lachlan McIlroy
Browse files

[XFS] Add compat handlers for swapext ioctl 



The big hitter here was the bstat field, which contains
different sized time_t on 32 vs. 64 bit.  Add a copyin
function to translate the 32-bit arg to 64-bit, and
call the swapext ioctl helper.

Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent d5547f9f

fs/xfs/linux-2.6/xfs_ioctl32.c

+56 −5
Original line number Diff line number Diff line
@@ -108,6 +108,50 @@ xfs_inumbers_fmt_compat( 
#define xfs_inumbers_fmt_compat xfs_inumbers_fmt

#endif



STATIC int

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 */



	if (get_user(sec32,		&bstime32->tv_sec)	||

	    get_user(bstime->tv_nsec,	&bstime32->tv_nsec))

		return -XFS_ERROR(EFAULT);

	bstime->tv_sec = sec32;

	return 0;

}



/* xfs_bstat_t has differing alignment on intel, & bstime_t sizes everywhere */

STATIC int

xfs_ioctl32_bstat_copyin(

	xfs_bstat_t		*bstat,

	compat_xfs_bstat_t	__user *bstat32)

{

	if (get_user(bstat->bs_ino,	&bstat32->bs_ino)	||

	    get_user(bstat->bs_mode,	&bstat32->bs_mode)	||

	    get_user(bstat->bs_nlink,	&bstat32->bs_nlink)	||

	    get_user(bstat->bs_uid,	&bstat32->bs_uid)	||

	    get_user(bstat->bs_gid,	&bstat32->bs_gid)	||

	    get_user(bstat->bs_rdev,	&bstat32->bs_rdev)	||

	    get_user(bstat->bs_blksize,	&bstat32->bs_blksize)	||

	    get_user(bstat->bs_size,	&bstat32->bs_size)	||

	    xfs_ioctl32_bstime_copyin(&bstat->bs_atime, &bstat32->bs_atime) ||

	    xfs_ioctl32_bstime_copyin(&bstat->bs_mtime, &bstat32->bs_mtime) ||

	    xfs_ioctl32_bstime_copyin(&bstat->bs_ctime, &bstat32->bs_ctime) ||

	    get_user(bstat->bs_blocks,	&bstat32->bs_size)	||

	    get_user(bstat->bs_xflags,	&bstat32->bs_size)	||

	    get_user(bstat->bs_extsize,	&bstat32->bs_extsize)	||

	    get_user(bstat->bs_extents,	&bstat32->bs_extents)	||

	    get_user(bstat->bs_gen,	&bstat32->bs_gen)	||

	    get_user(bstat->bs_projid,	&bstat32->bs_projid)	||

	    get_user(bstat->bs_dmevmask, &bstat32->bs_dmevmask)	||

	    get_user(bstat->bs_dmstate,	&bstat32->bs_dmstate)	||

	    get_user(bstat->bs_aextents, &bstat32->bs_aextents))

		return -XFS_ERROR(EFAULT);

	return 0;

}



/* XFS_IOC_FSBULKSTAT and friends */



STATIC int
@@ -292,6 +336,18 @@ xfs_compat_ioctl( 
	case XFS_IOC_GETVERSION_32:

		cmd = _NATIVE_IOC(cmd, long);

		break;

	case XFS_IOC_SWAPEXT: {

		struct xfs_swapext	  sxp;

		struct compat_xfs_swapext __user *sxu = arg;



		/* Bulk copy in up to the sx_stat field, then grab bstat */

		if (copy_from_user(&sxp, sxu,

				   offsetof(xfs_swapext_t, sx_stat)) ||

		    xfs_ioctl32_bstat_copyin(&sxp.sx_stat, &sxu->sx_stat))

			return -XFS_ERROR(EFAULT);

		error = xfs_swapext(&sxp);

		return -error;

	}

#ifdef BROKEN_X86_ALIGNMENT

	/* xfs_flock_t has wrong u32 vs u64 alignment */

	case XFS_IOC_ALLOCSP_32:
@@ -322,11 +378,6 @@ xfs_compat_ioctl( 
	case XFS_IOC_UNRESVSP64:

	case XFS_IOC_FSGEOMETRY_V1:

		break;



	/* xfs_bstat_t still has wrong u32 vs u64 alignment */

	case XFS_IOC_SWAPEXT:

		break;



#endif

	case XFS_IOC_FSBULKSTAT_32:

	case XFS_IOC_FSBULKSTAT_SINGLE_32:

fs/xfs/linux-2.6/xfs_ioctl32.h

+13 −0
Original line number Diff line number Diff line
@@ -110,6 +110,19 @@ typedef struct compat_xfs_fsop_handlereq { 
#define XFS_IOC_READLINK_BY_HANDLE_32 \

	_IOWR('X', 108, struct compat_xfs_fsop_handlereq)



/* The bstat field in the swapext struct needs translation */

typedef struct compat_xfs_swapext {

	__int64_t		sx_version;	/* version */

	__int64_t		sx_fdtarget;	/* fd of target file */

	__int64_t		sx_fdtmp;	/* fd of tmp file */

	xfs_off_t		sx_offset;	/* offset into file */

	xfs_off_t		sx_length;	/* leng from offset */

	char			sx_pad[16];	/* pad space, unused */

	compat_xfs_bstat_t	sx_stat;	/* stat of target b4 copy */

} __compat_packed compat_xfs_swapext_t;



#define XFS_IOC_SWAPEXT_32	_IOWR('X', 109, struct compat_xfs_swapext)



#ifdef BROKEN_X86_ALIGNMENT

/* on ia32 l_start is on a 32-bit boundary */

typedef struct compat_xfs_flock64 {