net/socket: Break down __sys_setsockopt

[ Upstream commit 1406245c29454ff84919736be83e14cdaba7fec1 ]

Split __sys_setsockopt() into two functions by removing the core
logic into a sub-function (do_sock_setsockopt()). This will avoid
code duplication when doing the same operation in other callers, for
instance.

do_sock_setsockopt() will be called by io_uring setsockopt() command
operation in the following patch.

Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Martin KaFai Lau <martin.lau@kernel.org>
Link: https://lore.kernel.org/r/20231016134750.1381153-4-leitao@debian.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Stable-dep-of: 33f339a1ba54 ("bpf, net: Fix a potential race in do_sock_getsockopt()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/net/sock.h b/include/net/sock.h
index 5942b5ff4c78604c91a9165ff65d6381fce0ab57..bb010cc53b910244244fd39044d2ce1a3d0160bf 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1875,6 +1875,8 @@ int sk_setsockopt(struct sock *sk, int level, int optname,
                  sockptr_t optval, unsigned int optlen);
 int sock_setsockopt(struct socket *sock, int level, int op,
                    sockptr_t optval, unsigned int optlen);
+int do_sock_setsockopt(struct socket *sock, bool compat, int level,
+                      int optname, sockptr_t optval, int optlen);
 
 int sk_getsockopt(struct sock *sk, int level, int optname,
                  sockptr_t optval, sockptr_t optlen);

diff --git a/net/socket.c b/net/socket.c
index f0f087004728e0c44204da519d95cf0be1bc6587..aa563fc0cee461c77071f2fb524141a1ca7e617e 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2281,31 +2281,21 @@ static bool sock_use_custom_sol_socket(const struct socket *sock)
        return test_bit(SOCK_CUSTOM_SOCKOPT, &sock->flags);
 }
 
-/*
- *     Set a socket option. Because we don't know the option lengths we have
- *     to pass the user mode parameter for the protocols to sort out.
- */
-int __sys_setsockopt(int fd, int level, int optname, char __user *user_optval,
-               int optlen)
+int do_sock_setsockopt(struct socket *sock, bool compat, int level,
+                      int optname, sockptr_t optval, int optlen)
 {
-       sockptr_t optval = USER_SOCKPTR(user_optval);
        const struct proto_ops *ops;
        char *kernel_optval = NULL;
-       int err, fput_needed;
-       struct socket *sock;
+       int err;
 
        if (optlen < 0)
                return -EINVAL;
 
-       sock = sockfd_lookup_light(fd, &err, &fput_needed);
-       if (!sock)
-               return err;
-
        err = security_socket_setsockopt(sock, level, optname);
        if (err)
                goto out_put;
 
-       if (!in_compat_syscall())
+       if (!compat)
                err = BPF_CGROUP_RUN_PROG_SETSOCKOPT(sock->sk, &level, &optname,
                                                     optval, &optlen,
                                                     &kernel_optval);
@@ -2328,6 +2318,27 @@ int __sys_setsockopt(int fd, int level, int optname, char __user *user_optval,
                                            optlen);
        kfree(kernel_optval);
 out_put:
+       return err;
+}
+EXPORT_SYMBOL(do_sock_setsockopt);
+
+/* Set a socket option. Because we don't know the option lengths we have
+ * to pass the user mode parameter for the protocols to sort out.
+ */
+int __sys_setsockopt(int fd, int level, int optname, char __user *user_optval,
+                    int optlen)
+{
+       sockptr_t optval = USER_SOCKPTR(user_optval);
+       bool compat = in_compat_syscall();
+       int err, fput_needed;
+       struct socket *sock;
+
+       sock = sockfd_lookup_light(fd, &err, &fput_needed);
+       if (!sock)
+               return err;
+
+       err = do_sock_setsockopt(sock, compat, level, optname, optval, optlen);
+
        fput_light(sock->file, fput_needed);
        return err;
 }