can-isotp: pass a sockptr_t into ->setsockopt - for Linux 5.9+

Following upstream commit a7b75c5a8c41 ("net: pass a sockptr_t into ->setsockopt") Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
hartkopp · Aug 12, 2020 · 0cb92ae · 0cb92ae
1 parent ced84ca
commit 0cb92ae
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/net/can/isotp.c b/net/can/isotp.c
@@ -1219,7 +1219,11 @@ static int isotp_getname(struct socket *sock, struct sockaddr *uaddr,
 #endif
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)
+#define copy_from_user copy_from_sockptr
+static int isotp_setsockopt(struct socket *sock, int level, int optname,
+			    sockptr_t optval, unsigned int optlen)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
 static int isotp_setsockopt(struct socket *sock, int level, int optname,
 			    char __user *optval, unsigned int optlen)
 #else