aboutsummaryrefslogtreecommitdiff
path: root/sys/compat/linuxkpi/common/include/linux
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@FreeBSD.org>2016-05-12 11:38:28 +0000
committerHans Petter Selasky <hselasky@FreeBSD.org>2016-05-12 11:38:28 +0000
commit3a8bec33ef8c141bbed385909913b110c674f0e5 (patch)
tree04f7e04df6406ff7a834fe475d053f0db4925dfc /sys/compat/linuxkpi/common/include/linux
parentcdf63a700c77204252e3c2e38d7106965559f3c6 (diff)
downloadsrc-3a8bec33ef8c141bbed385909913b110c674f0e5.tar.gz
src-3a8bec33ef8c141bbed385909913b110c674f0e5.zip
Fix handling of IOCTLs in the LinuxKPI.
Linux requires that all IOCTL data resides in userspace. FreeBSD always moves the main IOCTL structure into a kernel buffer before invoking the IOCTL handler and then copies it back into userspace, before returning. Hide this difference in the "linux_copyin()" and "linux_copyout()" functions by remapping userspace addresses in the range from 0x10000 to 0x20000, to the kernel IOCTL data buffer. It is assumed that the userspace code, data and stack segments starts no lower than memory address 0x400000, which is also stated by "man 1 ld", which means any valid userspace pointer can be passed to regular LinuxKPI handled IOCTLs. Bump the FreeBSD version to force recompilation of all kernel modules. Discussed with: kmacy @ MFC after: 1 week Sponsored by: Mellanox Technologies
Notes
Notes: svn path=/head/; revision=299530
Diffstat (limited to 'sys/compat/linuxkpi/common/include/linux')
-rw-r--r--sys/compat/linuxkpi/common/include/linux/sched.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/uaccess.h26
2 files changed, 17 insertions, 11 deletions
diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h
index ca1effe88600..bdaf7ae070f3 100644
--- a/sys/compat/linuxkpi/common/include/linux/sched.h
+++ b/sys/compat/linuxkpi/common/include/linux/sched.h
@@ -66,6 +66,8 @@ struct task_struct {
int should_stop;
pid_t pid;
const char *comm;
+ void *bsd_ioctl_data;
+ unsigned bsd_ioctl_len;
};
#define current task_struct_get(curthread)
diff --git a/sys/compat/linuxkpi/common/include/linux/uaccess.h b/sys/compat/linuxkpi/common/include/linux/uaccess.h
index e44024ec56df..2cfd950ab4de 100644
--- a/sys/compat/linuxkpi/common/include/linux/uaccess.h
+++ b/sys/compat/linuxkpi/common/include/linux/uaccess.h
@@ -34,19 +34,23 @@
#include <linux/compiler.h>
-#define __get_user(_x, _p) ({ \
- int __err; \
- __typeof(*(_p)) __x; \
- __err = -copyin((_p), &(__x), sizeof(*(_p))); \
- (_x) = __x; \
- __err; \
+#define __get_user(_x, _p) ({ \
+ int __err; \
+ __typeof(*(_p)) __x; \
+ __err = linux_copyin((_p), &(__x), sizeof(*(_p))); \
+ (_x) = __x; \
+ __err; \
})
-#define __put_user(_x, _p) ({ \
- __typeof(*(_p)) __x = (_x); \
- -copyout(&(__x), (_p), sizeof(*(_p))); \
+
+#define __put_user(_x, _p) ({ \
+ __typeof(*(_p)) __x = (_x); \
+ linux_copyout(&(__x), (_p), sizeof(*(_p))); \
})
-#define get_user(_x, _p) -copyin((_p), &(_x), sizeof(*(_p)))
-#define put_user(_x, _p) -copyout(&(_x), (_p), sizeof(*(_p)))
+#define get_user(_x, _p) linux_copyin((_p), &(_x), sizeof(*(_p)))
+#define put_user(_x, _p) linux_copyout(&(_x), (_p), sizeof(*(_p)))
+
+extern int linux_copyin(const void *uaddr, void *kaddr, size_t len);
+extern int linux_copyout(const void *kaddr, void *uaddr, size_t len);
/*
* NOTE: The returned value from pagefault_disable() must be stored