From bae89327320dd65b758cd0408f2457edd6873fa9 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 8 Jan 2019 06:46:51 +0000 Subject: [PATCH] kernel 5.0: Remove 'type' argument from access_ok() function See: https://github.com/torvalds/linux/commit/96d4f267e40f9509e8a66e2b39e8b95655617693 Signed-off-by: MilhouseVH Signed-off-by: Larry Finger --- os_dep/rtw_android.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/os_dep/rtw_android.c b/os_dep/rtw_android.c index dc77c4b..584f77c 100644 --- a/os_dep/rtw_android.c +++ b/os_dep/rtw_android.c @@ -625,9 +625,12 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) ret = -ENOMEM; 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)) { - RTW_INFO("%s: failed to access memory\n", __func__); +#endif + RTW_DBG("%s: failed to access memory\n", __func__); ret = -EFAULT; goto exit; }