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.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/udp.h b/include/net/udp.h
index 17a9e86a807638223bf6bcf0d81ada7f8d6e090d..295d52a73598277dc5071536f777d1a87e7df1d1 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -306,7 +306,7 @@ struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb,
 int udp_lib_getsockopt(struct sock *sk, int level, int optname,
                       char __user *optval, int __user *optlen);
 int udp_lib_setsockopt(struct sock *sk, int level, int optname,
-                      char __user *optval, unsigned int optlen,
+                      sockptr_t optval, unsigned int optlen,
                       int (*push_pending_frames)(struct sock *));
 struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
                             __be32 daddr, __be16 dport, int dif);

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index bb95cddcb040a64ac2b432bf6d3f7d238feb9260..c6cb2d09dbc75e2b4261b8854bd35db3251623df 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2588,7 +2588,7 @@ void udp_destroy_sock(struct sock *sk)
  *     Socket option code for UDP
  */
 int udp_lib_setsockopt(struct sock *sk, int level, int optname,
-                      char __user *optval, unsigned int optlen,
+                      sockptr_t optval, unsigned int optlen,
                       int (*push_pending_frames)(struct sock *))
 {
        struct udp_sock *up = udp_sk(sk);
@@ -2599,7 +2599,7 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,
        if (optlen < sizeof(int))
                return -EINVAL;
 
-       if (get_user(val, (int __user *)optval))
+       if (copy_from_sockptr(&val, optval, sizeof(val)))
                return -EFAULT;
 
        valbool = val ? 1 : 0;
@@ -2707,7 +2707,8 @@ int udp_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_push_pending_frames);
        return ip_setsockopt(sk, level, optname, optval, optlen);
 }

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 7c1143feb2bf7ef33e210fe3fdfe4e1fc613e415..2df1e6c9d7cbf6b4c8e332c81a76c2d35cc519ff 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1622,7 +1622,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);
 }