From 3a1d285975eb8b98c23d76c4599092161c842444 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Tue, 8 Jan 2019 10:36:21 +0100 Subject: [PATCH] kernel 5.0: Remove 'type' argument from access_ok() function --- dkms.conf | 2 +- os_dep/linux/rtw_android.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dkms.conf b/dkms.conf index 2600729..9189920 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="realtek-rtl88xxau" -PACKAGE_VERSION="5.2.20.2~20190102" +PACKAGE_VERSION="5.2.20.2~20190108" CLEAN="'make' clean" BUILT_MODULE_NAME[0]=88XXau PROCS_NUM=`nproc` diff --git a/os_dep/linux/rtw_android.c b/os_dep/linux/rtw_android.c index 6b1730f..2e88e21 100644 --- a/os_dep/linux/rtw_android.c +++ b/os_dep/linux/rtw_android.c @@ -624,7 +624,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 RTW_INFO("%s: failed to access memory\n", __FUNCTION__); ret = -EFAULT; goto exit;