xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: switch sock_set_timeout to sockptr_t

Browse Source 
Pass a sockptr_t to prepare for set_fs-less handling of the kernel
pointer from bpf-cgroup.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig
2020-07-23 08:08:50 +02:00
committed by David S. Miller
parent c34645ac25
commit c8c1bbb6eb
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/mptcp/protocol.c
View File

@@ -1648,7 +1648,8 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
return -EINVAL;
}
ret = sock_setsockopt(ssock, SOL_SOCKET, optname, optval, optlen);
ret = sock_setsockopt(ssock, SOL_SOCKET, optname,
USER_SOCKPTR(optval), optlen);
if (ret == 0) {
if (optname == SO_REUSEPORT)
sk->sk_reuseport = ssock->sk->sk_reuseport;
@@ -1659,7 +1660,8 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
return ret;
}
return sock_setsockopt(sk->sk_socket, SOL_SOCKET, optname, optval, optlen);
return sock_setsockopt(sk->sk_socket, SOL_SOCKET, optname,
USER_SOCKPTR(optval), optlen);
}
static int mptcp_setsockopt_v6(struct mptcp_sock *msk, int optname,