From d9340a46aab3f2ea8bce23e3bcc67edf894cffa0 Mon Sep 17 00:00:00 2001
From: hselasky <hselasky@FreeBSD.org>
Date: Thu, 18 Apr 2019 19:04:07 +0000
Subject: [PATCH] Implement flag for telling cuse(3) clients if the peer is
 running in 32-bit compat mode or not. This is useful when implementing
 compatibility ioctl(2) handlers in userspace.

MFC after:		1 week
Sponsored by:		Mellanox Technologies
---
 lib/libcuse/cuse.3      | 3 ++-
 sys/fs/cuse/cuse.c      | 6 +++++-
 sys/fs/cuse/cuse_defs.h | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/libcuse/cuse.3 b/lib/libcuse/cuse.3
index 89eef889a8b6..74888a687be8 100644
--- a/lib/libcuse/cuse.3
+++ b/lib/libcuse/cuse.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd October 5, 2017
+.Dd April 17, 2019
 .Dt CUSE 3
 .Os
 .Sh NAME
@@ -303,6 +303,7 @@ enum {
   CUSE_FFLAG_READ
   CUSE_FFLAG_WRITE
   CUSE_FFLAG_NONBLOCK
+  CUSE_FFLAG_COMPAT32
 
   CUSE_CMD_NONE
   CUSE_CMD_OPEN
diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c
index 572ec49fc070..578bf3eda74f 100644
--- a/sys/fs/cuse/cuse.c
+++ b/sys/fs/cuse/cuse.c
@@ -51,6 +51,7 @@
 #include <sys/vnode.h>
 #include <sys/selinfo.h>
 #include <sys/ptrace.h>
+#include <sys/sysent.h>
 
 #include <machine/bus.h>
 
@@ -536,7 +537,10 @@ cuse_client_send_command_locked(struct cuse_client_command *pccmd,
 
 	if (ioflag & IO_NDELAY)
 		cuse_fflags |= CUSE_FFLAG_NONBLOCK;
-
+#if defined(__LP64__)
+	if (SV_CURPROC_FLAG(SV_ILP32))
+		cuse_fflags |= CUSE_FFLAG_COMPAT32;
+#endif
 	pccmd->sub.fflags = cuse_fflags;
 	pccmd->sub.data_pointer = data_ptr;
 	pccmd->sub.argument = arg;
diff --git a/sys/fs/cuse/cuse_defs.h b/sys/fs/cuse/cuse_defs.h
index cf148af85d15..b5f2eba1b23e 100644
--- a/sys/fs/cuse/cuse_defs.h
+++ b/sys/fs/cuse/cuse_defs.h
@@ -27,7 +27,7 @@
 #ifndef _CUSE_DEFS_H_
 #define	_CUSE_DEFS_H_
 
-#define	CUSE_VERSION		0x000123
+#define	CUSE_VERSION		0x000124
 
 #define	CUSE_ERR_NONE		0
 #define	CUSE_ERR_BUSY		-1
@@ -49,6 +49,7 @@
 #define	CUSE_FFLAG_READ		1
 #define	CUSE_FFLAG_WRITE	2
 #define	CUSE_FFLAG_NONBLOCK	4
+#define	CUSE_FFLAG_COMPAT32	8 /* peer is running in 32-bit compat mode */
 
 #define	CUSE_DBG_NONE		0
 #define	CUSE_DBG_FULL		1