mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
UPSTREAM: net/udp: switch udp_lib_setsockopt to sockptr_t
Pass a sockptr_t to prepare for set_fs-less handling of the kernel pointer from bpf-cgroup. Change-Id: I52a7b51c25c679a672d967abf5195e4f82524840 Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
6c0600ad29
commit
75d0191fd1
3 changed files with 9 additions and 7 deletions
|
|
@ -1586,7 +1586,8 @@ int udpv6_setsockopt(struct sock *sk, int level, int optname,
|
|||
char __user *optval, unsigned int optlen)
|
||||
{
|
||||
if (level == SOL_UDP || level == SOL_UDPLITE)
|
||||
return udp_lib_setsockopt(sk, level, optname, optval, optlen,
|
||||
return udp_lib_setsockopt(sk, level, optname,
|
||||
USER_SOCKPTR(optval), optlen,
|
||||
udp_v6_push_pending_frames);
|
||||
return ipv6_setsockopt(sk, level, optname, optval, optlen);
|
||||
}
|
||||
|
|
@ -1596,7 +1597,7 @@ int compat_udpv6_setsockopt(struct sock *sk, int level, int optname,
|
|||
char __user *optval, unsigned int optlen)
|
||||
{
|
||||
if (level == SOL_UDP || level == SOL_UDPLITE)
|
||||
return udp_lib_setsockopt(sk, level, optname, optval, optlen,
|
||||
return udp_lib_setsockopt(sk, level, optname, USER_SOCKPTR(optval), optlen,
|
||||
udp_v6_push_pending_frames);
|
||||
return compat_ipv6_setsockopt(sk, level, optname, optval, optlen);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue