bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/socket: Break down __sys_setsockopt

Browse source 
[ 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>
This commit is contained in:
Breno Leitao 2023-10-16 06:47:41 -07:00 • committed by Greg Kroah-Hartman
parent 09fba0162b
commit e88c16a4f0
2 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/net/sock.h
View file

@ -1875,6 +1875,8 @@ int sk_setsockopt(struct sock *sk, int level, int optname,
sockptr_t optval, unsigned int optlen); sockptr_t optval, unsigned int optlen);
int sock_setsockopt(struct socket *sock, int level, int op, int sock_setsockopt(struct socket *sock, int level, int op,
sockptr_t optval, unsigned int optlen); 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, int sk_getsockopt(struct sock *sk, int level, int optname,
sockptr_t optval, sockptr_t optlen); sockptr_t optval, sockptr_t optlen);

39
net/socket.c
View file

@ -2281,31 +2281,21 @@ static bool sock_use_custom_sol_socket(const struct socket *sock)
return test_bit(SOCK_CUSTOM_SOCKOPT, &sock->flags); return test_bit(SOCK_CUSTOM_SOCKOPT, &sock->flags);
} }
/* int do_sock_setsockopt(struct socket *sock, bool compat, int level,
* Set a socket option. Because we don't know the option lengths we have int optname, sockptr_t optval, int optlen)
* 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);
const struct proto_ops *ops; const struct proto_ops *ops;
char *kernel_optval = NULL; char *kernel_optval = NULL;
int err, fput_needed; int err;
struct socket *sock;
if (optlen < 0) if (optlen < 0)
return -EINVAL; return -EINVAL;
sock = sockfd_lookup_light(fd, &err, &fput_needed);
if (!sock)
return err;
err = security_socket_setsockopt(sock, level, optname); err = security_socket_setsockopt(sock, level, optname);
if (err) if (err)
goto out_put; goto out_put;
if (!in_compat_syscall()) if (!compat)
err = BPF_CGROUP_RUN_PROG_SETSOCKOPT(sock->sk, &level, &optname, err = BPF_CGROUP_RUN_PROG_SETSOCKOPT(sock->sk, &level, &optname,
optval, &optlen, optval, &optlen,
&kernel_optval); &kernel_optval);
@ -2328,6 +2318,27 @@ int __sys_setsockopt(int fd, int level, int optname, char __user *user_optval,
optlen); optlen);
kfree(kernel_optval); kfree(kernel_optval);
out_put: 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); fput_light(sock->file, fput_needed);
return err; return err;
} }