mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-23 21:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk' into master

Browse Source
This commit is contained in:
Bart Van Assche
2020-08-29 14:19:50 -07:00
parent 2548b749ac bd3aa5d4a5
commit 15a463c052
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iscsi-scst/kernel/conn.c
View File

@@ -791,7 +791,7 @@ static int conn_setup_sock(struct iscsi_conn *conn)
oldfs = get_fs();
set_fs(KERNEL_DS);
conn->sock->ops->setsockopt(conn->sock, SOL_TCP, TCP_NODELAY,
(void __force __user *)&opt, sizeof(opt));
KERNEL_SOCKPTR(&opt), sizeof(opt));
set_fs(oldfs);
out:

2
iscsi-scst/kernel/iscsi.c
View File

@@ -2895,7 +2895,7 @@ static inline void set_cork(struct socket *sock, int on)
oldfs = get_fs();
set_fs(KERNEL_DS);
sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK,
(void __force __user *)&opt, sizeof(opt));
KERNEL_SOCKPTR(&opt), sizeof(opt));
set_fs(oldfs);
return;
}

10
scst/include/backport.h
View File

@@ -1727,6 +1727,16 @@ static inline struct kmem_cache *kmem_cache_create_usercopy(const char *name,
sizeof_field(struct __struct, __field), NULL)
#endif
/* <linux/sockptr.h> */
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
/* See also commit ba423fdaa589 ("net: add a new sockptr_t type") # v5.9 */
static inline void __user *KERNEL_SOCKPTR(void *p)
{
return (void __force __user *)p;
}
#endif
/* <linux/stddef.h> */
#ifndef sizeof_field