summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-07-23 08:08:50 +0200
committerDavid S. Miller <davem@davemloft.net>2020-07-24 15:41:53 -0700
commitc8c1bbb6eb498109286739f8b6090e99313dd104 (patch)
tree1782966e2597d7cb05e058ed2eeaf4689cfa2a0b /net/socket.c
parentc34645ac25484968ddace9a6b140b70e72dc49b3 (diff)
downloadlinux-c8c1bbb6eb498109286739f8b6090e99313dd104.tar.gz
linux-c8c1bbb6eb498109286739f8b6090e99313dd104.tar.bz2
linux-c8c1bbb6eb498109286739f8b6090e99313dd104.zip
net: switch sock_set_timeout to sockptr_t
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>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c
index 93846568c2fb..c97f83d879ae 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2130,7 +2130,8 @@ int __sys_setsockopt(int fd, int level, int optname, char __user *optval,
}
if (level == SOL_SOCKET && !sock_use_custom_sol_socket(sock))
- err = sock_setsockopt(sock, level, optname, optval, optlen);
+ err = sock_setsockopt(sock, level, optname,
+ USER_SOCKPTR(optval), optlen);
else if (unlikely(!sock->ops->setsockopt))
err = -EOPNOTSUPP;
else