Merge pull request #110 from MilhouseVH/fix-5.0-rc1

kernel 5.0: Remove 'type' argument from access_ok() function
This commit is contained in:
Carlos Garcés 2019-01-08 10:35:27 +01:00 committed by GitHub
commit b63646fb61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions

View File

@ -30,7 +30,7 @@ matrix:
- gcc-5
- libelf-dev
- libssl1.1
env: COMPILER=gcc-5 KVER=4.19-rc1
env: COMPILER=gcc-5 KVER=5.0-rc1
- compiler: gcc
addons:
apt:
@ -41,7 +41,7 @@ matrix:
- gcc-6
- libelf-dev
- libssl1.1
env: COMPILER=gcc-6 KVER=4.19-rc1
env: COMPILER=gcc-6 KVER=5.0-rc1
- compiler: gcc
addons:
apt:
@ -52,7 +52,7 @@ matrix:
- gcc-7
- libelf-dev
- libssl1.1
env: COMPILER=gcc-7 KVER=4.19-rc1
env: COMPILER=gcc-7 KVER=5.0-rc1
- compiler: gcc
addons:
apt:

View File

@ -626,7 +626,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;