fix 32-bit compat ioctls for GETXFLAGS, SETXFLAGS, GETVERSION

PATCH Superseded Eric Sandeen 2 participants 4 messages Sep 17, 2007 XFS filesystem

Share & tools

Eric Sandeen

author

2007-09-17 02:50 UTC #0 lore raw

PATCH 1/1 fix 32-bit compat ioctls for GETXFLAGS, SETXFLAGS, GETVERSION

XFS_IOC_GETVERSION, XFS_IOC_GETXFLAGS and XFS_IOC_SETXFLAGS all take a "long" which changes size between 32 and 64 bit platforms.

So, the ioctl cmds that come in from a 32-bit app aren't as expected, for example on GETXFLAGS,

	unknown cmd fd(3) cmd(80046601){t:'f';sz:4}

due to the size mismatch.

So, use instead the 32-bit version of the commands for compat ioctls, and other than that it doesn't take any more manipulation.

Also, for both native and compat versions, just define them to the values as defined in fs.h

Signed-off-by Eric Sandeen <[email protected]>

fs/xfs/linux-2.6/xfs_ioctl32.c +5 -3

Index: linux-2.6.22/fs/xfs/linux-2.6/xfs_ioctl32.c
===================================================================
@@ -376,9 +376,6 @@ xfs_compat_ioctl(
 	switch (cmd) {
 	case XFS_IOC_DIOINFO:
 	case XFS_IOC_FSGEOMETRY:
-	case XFS_IOC_GETVERSION:
-	case XFS_IOC_GETXFLAGS:
-	case XFS_IOC_SETXFLAGS:
 	case XFS_IOC_FSGETXATTR:
 	case XFS_IOC_FSSETXATTR:
 	case XFS_IOC_FSGETXATTRA:

@@ -404,6 +401,11 @@ xfs_compat_ioctl(
 	case XFS_IOC_ERROR_CLEARALL:
 		break;
 
+	case XFS_IOC32_GETXFLAGS:
+	case XFS_IOC32_SETXFLAGS:
+	case XFS_IOC32_GETVERSION:
+		cmd = _NATIVE_IOC(cmd, long);
+		break;
 #ifdef BROKEN_X86_ALIGNMENT
 	/* xfs_flock_t has wrong u32 vs u64 alignment */
 	case XFS_IOC_ALLOCSP_32:

fs/xfs/xfs_fs.h +7 -3

Index: linux-2.6.22/fs/xfs/xfs_fs.h
===================================================================
@@ -436,9 +436,13 @@ typedef struct xfs_handle {
 /*
  * ioctl commands that are used by Linux filesystems
  */
-#define XFS_IOC_GETXFLAGS	_IOR('f', 1, long)
-#define XFS_IOC_SETXFLAGS	_IOW('f', 2, long)
-#define XFS_IOC_GETVERSION	_IOR('v', 1, long)
+#define XFS_IOC_GETXFLAGS	FS_IOC_GETFLAGS
+#define XFS_IOC_SETXFLAGS	FS_IOC_SETFLAGS
+#define XFS_IOC_GETVERSION	FS_IOC_GETVERSION
+/* 32-bit compat counterparts */
+#define XFS_IOC32_GETXFLAGS	FS_IOC32_GETFLAGS
+#define XFS_IOC32_SETXFLAGS	FS_IOC32_SETFLAGS
+#define XFS_IOC32_GETVERSION	FS_IOC32_GETVERSION
 
 /*

* ioctl commands that replace IRIX fcntl()'s

Eric Sandeen

author

2007-09-17 17:36 UTC #1 lore raw

PATCH v2 1/1 fix 32-bit compat ioctls for GETXFLAGS, SETXFLAGS, GETVERSION

(With rh bug info and attribution for the bug-finder)

---------

In Red Hat bugzilla #291981, Sami Farin notes that 32-bit-compat lsattr/chattr does not work on xfs. After investigation, I found:

XFS_IOC_GETVERSION, XFS_IOC_GETXFLAGS and XFS_IOC_SETXFLAGS all take a "long" which changes size between 32 and 64 bit platforms.

So, the ioctl cmds that come in from a 32-bit app aren't as expected, for example on GETXFLAGS,

	unknown cmd fd(3) cmd(80046601){t:'f';sz:4}

due to the size mismatch.

So, use instead the 32-bit version of the commands for compat ioctls, and other than that it doesn't take any more manipulation.

Also, for both native and compat versions, just define them to the values as defined in fs.h

Signed-off-by Eric Sandeen <[email protected]>

fs/xfs/linux-2.6/xfs_ioctl32.c +5 -3

Index: linux-2.6.22/fs/xfs/linux-2.6/xfs_ioctl32.c
===================================================================
@@ -376,9 +376,6 @@ xfs_compat_ioctl(
 	switch (cmd) {
 	case XFS_IOC_DIOINFO:
 	case XFS_IOC_FSGEOMETRY:
-	case XFS_IOC_GETVERSION:
-	case XFS_IOC_GETXFLAGS:
-	case XFS_IOC_SETXFLAGS:
 	case XFS_IOC_FSGETXATTR:
 	case XFS_IOC_FSSETXATTR:
 	case XFS_IOC_FSGETXATTRA:

@@ -404,6 +401,11 @@ xfs_compat_ioctl(
 	case XFS_IOC_ERROR_CLEARALL:
 		break;
 
+	case XFS_IOC32_GETXFLAGS:
+	case XFS_IOC32_SETXFLAGS:
+	case XFS_IOC32_GETVERSION:
+		cmd = _NATIVE_IOC(cmd, long);
+		break;
 #ifdef BROKEN_X86_ALIGNMENT
 	/* xfs_flock_t has wrong u32 vs u64 alignment */
 	case XFS_IOC_ALLOCSP_32:

fs/xfs/xfs_fs.h +7 -3

Index: linux-2.6.22/fs/xfs/xfs_fs.h
===================================================================
@@ -436,9 +436,13 @@ typedef struct xfs_handle {
 /*
  * ioctl commands that are used by Linux filesystems
  */
-#define XFS_IOC_GETXFLAGS	_IOR('f', 1, long)
-#define XFS_IOC_SETXFLAGS	_IOW('f', 2, long)
-#define XFS_IOC_GETVERSION	_IOR('v', 1, long)
+#define XFS_IOC_GETXFLAGS	FS_IOC_GETFLAGS
+#define XFS_IOC_SETXFLAGS	FS_IOC_SETFLAGS
+#define XFS_IOC_GETVERSION	FS_IOC_GETVERSION
+/* 32-bit compat counterparts */
+#define XFS_IOC32_GETXFLAGS	FS_IOC32_GETFLAGS
+#define XFS_IOC32_SETXFLAGS	FS_IOC32_SETFLAGS
+#define XFS_IOC32_GETVERSION	FS_IOC32_GETVERSION
 
 /*

* ioctl commands that replace IRIX fcntl()'s

Christoph Hellwig

2007-09-17 18:27 UTC #2 lore raw

Quoted 2 lines · Eric Sandeen

Also, for both native and compat versions, just define them to the values as defined in fs.h

Should we just kill the XFS_ variants?

Otherwise the patch looks good.

Eric Sandeen

author

2007-09-17 18:33 UTC #3 lore raw

Quoted 8 lines · Christoph Hellwig

Quoted 2 lines · Eric Sandeen
Also, for both native and compat versions, just define them to the values as defined in fs.h
Should we just kill the XFS_ variants?
Otherwise the patch looks good.

perhaps. It looks like ext3 tried to move GETVERSION, too, though generic kernel variant still uses the "old" one.

-Eric