From: Mathias Kresin <dev@kresin.me>
Date: Sun, 7 Jul 2019 15:13:18 +0000 (+0200)
Subject: ltq-atm: add Linux 5.0+ compatibility
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a3539c82cb38366151019438ea841e8ae47cb1c2;p=openwrt%2Fstaging%2Fjogo.git

ltq-atm: add Linux 5.0+ compatibility

Upstream commit 96d4f267e40f95 ("Remove 'type' argument from access_ok()
function") removes the first argument to access_ok.
Adjust the code so it builds with Linux 5.4.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Mathias Kresin <dev@kresin.me>
---

diff --git a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
index 6e6f4c66c7..267a515df6 100644
--- a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
+++ b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
@@ -289,9 +289,17 @@ static int ppe_ioctl(struct atm_dev *dev, unsigned int cmd, void *arg)
 		return -ENOTTY;
 
 	if ( _IOC_DIR(cmd) & _IOC_READ )
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0)
+		ret = !access_ok(arg, _IOC_SIZE(cmd));
+#else
 		ret = !access_ok(VERIFY_WRITE, arg, _IOC_SIZE(cmd));
+#endif
 	else if ( _IOC_DIR(cmd) & _IOC_WRITE )
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0)
+		ret = !access_ok(arg, _IOC_SIZE(cmd));
+#else
 		ret = !access_ok(VERIFY_READ, arg, _IOC_SIZE(cmd));
+#endif
 	if ( ret )
 		return -EFAULT;