From 33d8e02cd1aa69919e5275b880fc7ae5abf9f045 Mon Sep 17 00:00:00 2001 From: Nicholas George Date: Thu, 21 Mar 2019 03:38:50 -0500 Subject: [PATCH] Allow building on 5.0 (#288) * Removed TYPE parameter in access_ok Kernel 5.0 removed the TYPE parameter for access_ok, therefore the make will fail. This just literally removes 13 characters from Line 603. * Allow older kernel versions with 5.0 --- os_dep/linux/rtw_android.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/os_dep/linux/rtw_android.c b/os_dep/linux/rtw_android.c index 94be60b..11b40a0 100644 --- a/os_dep/linux/rtw_android.c +++ b/os_dep/linux/rtw_android.c @@ -600,7 +600,11 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) goto exit; } + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) + if (!access_ok(priv_cmd.buf, priv_cmd.total_len)) { + #else if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)) { + #endif DBG_871X("%s: failed to access memory\n", __FUNCTION__); ret = -EFAULT; goto exit;