mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 00:48:50 +00:00
82ba0ff7bf
We should not call trace_handshake_cmd_done_err() if socket lookup has failed. Also we should call trace_handshake_cmd_done_err() before releasing the file, otherwise dereferencing sock->sk can return garbage. This also reverts7afc6d0a10
("net/handshake: Fix uninitialized local variable") Unable to handle kernel paging request at virtual address dfff800000000003 KASAN: null-ptr-deref in range [0x0000000000000018-0x000000000000001f] Mem abort info: ESR = 0x0000000096000005 EC = 0x25: DABT (current EL), IL = 32 bits SET = 0, FnV = 0 EA = 0, S1PTW = 0 FSC = 0x05: level 1 translation fault Data abort info: ISV = 0, ISS = 0x00000005, ISS2 = 0x00000000 CM = 0, WnR = 0, TnD = 0, TagAccess = 0 GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [dfff800000000003] address between user and kernel address ranges Internal error: Oops: 0000000096000005 [#1] PREEMPT SMP Modules linked in: CPU: 1 PID: 5986 Comm: syz-executor292 Not tainted 6.5.0-rc7-syzkaller-gfe4469582053 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/26/2023 pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : handshake_nl_done_doit+0x198/0x9c8 net/handshake/netlink.c:193 lr : handshake_nl_done_doit+0x180/0x9c8 sp : ffff800096e37180 x29: ffff800096e37200 x28: 1ffff00012dc6e34 x27: dfff800000000000 x26: ffff800096e373d0 x25: 0000000000000000 x24: 00000000ffffffa8 x23: ffff800096e373f0 x22: 1ffff00012dc6e38 x21: 0000000000000000 x20: ffff800096e371c0 x19: 0000000000000018 x18: 0000000000000000 x17: 0000000000000000 x16: ffff800080516cc4 x15: 0000000000000001 x14: 1fffe0001b14aa3b x13: 0000000000000000 x12: 0000000000000000 x11: 0000000000000000 x10: 0000000000000000 x9 : 0000000000000003 x8 : 0000000000000003 x7 : ffff800080afe47c x6 : 0000000000000000 x5 : 0000000000000000 x4 : 0000000000000000 x3 : ffff800080a88078 x2 : 0000000000000001 x1 : 00000000ffffffa8 x0 : 0000000000000000 Call trace: handshake_nl_done_doit+0x198/0x9c8 net/handshake/netlink.c:193 genl_family_rcv_msg_doit net/netlink/genetlink.c:970 [inline] genl_family_rcv_msg net/netlink/genetlink.c:1050 [inline] genl_rcv_msg+0x96c/0xc50 net/netlink/genetlink.c:1067 netlink_rcv_skb+0x214/0x3c4 net/netlink/af_netlink.c:2549 genl_rcv+0x38/0x50 net/netlink/genetlink.c:1078 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x660/0x8d4 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x834/0xb18 net/netlink/af_netlink.c:1914 sock_sendmsg_nosec net/socket.c:725 [inline] sock_sendmsg net/socket.c:748 [inline] ____sys_sendmsg+0x56c/0x840 net/socket.c:2494 ___sys_sendmsg net/socket.c:2548 [inline] __sys_sendmsg+0x26c/0x33c net/socket.c:2577 __do_sys_sendmsg net/socket.c:2586 [inline] __se_sys_sendmsg net/socket.c:2584 [inline] __arm64_sys_sendmsg+0x80/0x94 net/socket.c:2584 __invoke_syscall arch/arm64/kernel/syscall.c:37 [inline] invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:51 el0_svc_common+0x130/0x23c arch/arm64/kernel/syscall.c:136 do_el0_svc+0x48/0x58 arch/arm64/kernel/syscall.c:155 el0_svc+0x58/0x16c arch/arm64/kernel/entry-common.c:678 el0t_64_sync_handler+0x84/0xfc arch/arm64/kernel/entry-common.c:696 el0t_64_sync+0x190/0x194 arch/arm64/kernel/entry.S:591 Code: 12800108 b90043e8 910062b3 d343fe68 (387b6908) Fixes:3b3009ea8a
("net/handshake: Create a NETLINK service for handling handshake requests") Reported-by: syzbot <syzkaller@googlegroups.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Chuck Lever <chuck.lever@oracle.com> Reviewed-by: Michal Kubiak <michal.kubiak@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
311 lines
7.3 KiB
C
311 lines
7.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Generic netlink handshake service
|
|
*
|
|
* Author: Chuck Lever <chuck.lever@oracle.com>
|
|
*
|
|
* Copyright (c) 2023, Oracle and/or its affiliates.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/socket.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/mm.h>
|
|
|
|
#include <net/sock.h>
|
|
#include <net/genetlink.h>
|
|
#include <net/netns/generic.h>
|
|
|
|
#include <kunit/visibility.h>
|
|
|
|
#include <uapi/linux/handshake.h>
|
|
#include "handshake.h"
|
|
#include "genl.h"
|
|
|
|
#include <trace/events/handshake.h>
|
|
|
|
/**
|
|
* handshake_genl_notify - Notify handlers that a request is waiting
|
|
* @net: target network namespace
|
|
* @proto: handshake protocol
|
|
* @flags: memory allocation control flags
|
|
*
|
|
* Returns zero on success or a negative errno if notification failed.
|
|
*/
|
|
int handshake_genl_notify(struct net *net, const struct handshake_proto *proto,
|
|
gfp_t flags)
|
|
{
|
|
struct sk_buff *msg;
|
|
void *hdr;
|
|
|
|
/* Disable notifications during unit testing */
|
|
if (!test_bit(HANDSHAKE_F_PROTO_NOTIFY, &proto->hp_flags))
|
|
return 0;
|
|
|
|
if (!genl_has_listeners(&handshake_nl_family, net,
|
|
proto->hp_handler_class))
|
|
return -ESRCH;
|
|
|
|
msg = genlmsg_new(GENLMSG_DEFAULT_SIZE, flags);
|
|
if (!msg)
|
|
return -ENOMEM;
|
|
|
|
hdr = genlmsg_put(msg, 0, 0, &handshake_nl_family, 0,
|
|
HANDSHAKE_CMD_READY);
|
|
if (!hdr)
|
|
goto out_free;
|
|
|
|
if (nla_put_u32(msg, HANDSHAKE_A_ACCEPT_HANDLER_CLASS,
|
|
proto->hp_handler_class) < 0) {
|
|
genlmsg_cancel(msg, hdr);
|
|
goto out_free;
|
|
}
|
|
|
|
genlmsg_end(msg, hdr);
|
|
return genlmsg_multicast_netns(&handshake_nl_family, net, msg,
|
|
0, proto->hp_handler_class, flags);
|
|
|
|
out_free:
|
|
nlmsg_free(msg);
|
|
return -EMSGSIZE;
|
|
}
|
|
|
|
/**
|
|
* handshake_genl_put - Create a generic netlink message header
|
|
* @msg: buffer in which to create the header
|
|
* @info: generic netlink message context
|
|
*
|
|
* Returns a ready-to-use header, or NULL.
|
|
*/
|
|
struct nlmsghdr *handshake_genl_put(struct sk_buff *msg,
|
|
struct genl_info *info)
|
|
{
|
|
return genlmsg_put(msg, info->snd_portid, info->snd_seq,
|
|
&handshake_nl_family, 0, info->genlhdr->cmd);
|
|
}
|
|
EXPORT_SYMBOL(handshake_genl_put);
|
|
|
|
/*
|
|
* dup() a kernel socket for use as a user space file descriptor
|
|
* in the current process. The kernel socket must have an
|
|
* instatiated struct file.
|
|
*
|
|
* Implicit argument: "current()"
|
|
*/
|
|
static int handshake_dup(struct socket *sock)
|
|
{
|
|
struct file *file;
|
|
int newfd;
|
|
|
|
file = get_file(sock->file);
|
|
newfd = get_unused_fd_flags(O_CLOEXEC);
|
|
if (newfd < 0) {
|
|
fput(file);
|
|
return newfd;
|
|
}
|
|
|
|
fd_install(newfd, file);
|
|
return newfd;
|
|
}
|
|
|
|
int handshake_nl_accept_doit(struct sk_buff *skb, struct genl_info *info)
|
|
{
|
|
struct net *net = sock_net(skb->sk);
|
|
struct handshake_net *hn = handshake_pernet(net);
|
|
struct handshake_req *req = NULL;
|
|
struct socket *sock;
|
|
int class, fd, err;
|
|
|
|
err = -EOPNOTSUPP;
|
|
if (!hn)
|
|
goto out_status;
|
|
|
|
err = -EINVAL;
|
|
if (GENL_REQ_ATTR_CHECK(info, HANDSHAKE_A_ACCEPT_HANDLER_CLASS))
|
|
goto out_status;
|
|
class = nla_get_u32(info->attrs[HANDSHAKE_A_ACCEPT_HANDLER_CLASS]);
|
|
|
|
err = -EAGAIN;
|
|
req = handshake_req_next(hn, class);
|
|
if (!req)
|
|
goto out_status;
|
|
|
|
sock = req->hr_sk->sk_socket;
|
|
fd = handshake_dup(sock);
|
|
if (fd < 0) {
|
|
err = fd;
|
|
goto out_complete;
|
|
}
|
|
err = req->hr_proto->hp_accept(req, info, fd);
|
|
if (err) {
|
|
fput(sock->file);
|
|
goto out_complete;
|
|
}
|
|
|
|
trace_handshake_cmd_accept(net, req, req->hr_sk, fd);
|
|
return 0;
|
|
|
|
out_complete:
|
|
handshake_complete(req, -EIO, NULL);
|
|
out_status:
|
|
trace_handshake_cmd_accept_err(net, req, NULL, err);
|
|
return err;
|
|
}
|
|
|
|
int handshake_nl_done_doit(struct sk_buff *skb, struct genl_info *info)
|
|
{
|
|
struct net *net = sock_net(skb->sk);
|
|
struct handshake_req *req;
|
|
struct socket *sock;
|
|
int fd, status, err;
|
|
|
|
if (GENL_REQ_ATTR_CHECK(info, HANDSHAKE_A_DONE_SOCKFD))
|
|
return -EINVAL;
|
|
fd = nla_get_u32(info->attrs[HANDSHAKE_A_DONE_SOCKFD]);
|
|
|
|
sock = sockfd_lookup(fd, &err);
|
|
if (!sock)
|
|
return err;
|
|
|
|
req = handshake_req_hash_lookup(sock->sk);
|
|
if (!req) {
|
|
err = -EBUSY;
|
|
trace_handshake_cmd_done_err(net, req, sock->sk, err);
|
|
fput(sock->file);
|
|
return err;
|
|
}
|
|
|
|
trace_handshake_cmd_done(net, req, sock->sk, fd);
|
|
|
|
status = -EIO;
|
|
if (info->attrs[HANDSHAKE_A_DONE_STATUS])
|
|
status = nla_get_u32(info->attrs[HANDSHAKE_A_DONE_STATUS]);
|
|
|
|
handshake_complete(req, status, info);
|
|
fput(sock->file);
|
|
return 0;
|
|
}
|
|
|
|
static unsigned int handshake_net_id;
|
|
|
|
static int __net_init handshake_net_init(struct net *net)
|
|
{
|
|
struct handshake_net *hn = net_generic(net, handshake_net_id);
|
|
unsigned long tmp;
|
|
struct sysinfo si;
|
|
|
|
/*
|
|
* Arbitrary limit to prevent handshakes that do not make
|
|
* progress from clogging up the system. The cap scales up
|
|
* with the amount of physical memory on the system.
|
|
*/
|
|
si_meminfo(&si);
|
|
tmp = si.totalram / (25 * si.mem_unit);
|
|
hn->hn_pending_max = clamp(tmp, 3UL, 50UL);
|
|
|
|
spin_lock_init(&hn->hn_lock);
|
|
hn->hn_pending = 0;
|
|
hn->hn_flags = 0;
|
|
INIT_LIST_HEAD(&hn->hn_requests);
|
|
return 0;
|
|
}
|
|
|
|
static void __net_exit handshake_net_exit(struct net *net)
|
|
{
|
|
struct handshake_net *hn = net_generic(net, handshake_net_id);
|
|
struct handshake_req *req;
|
|
LIST_HEAD(requests);
|
|
|
|
/*
|
|
* Drain the net's pending list. Requests that have been
|
|
* accepted and are in progress will be destroyed when
|
|
* the socket is closed.
|
|
*/
|
|
spin_lock(&hn->hn_lock);
|
|
set_bit(HANDSHAKE_F_NET_DRAINING, &hn->hn_flags);
|
|
list_splice_init(&requests, &hn->hn_requests);
|
|
spin_unlock(&hn->hn_lock);
|
|
|
|
while (!list_empty(&requests)) {
|
|
req = list_first_entry(&requests, struct handshake_req, hr_list);
|
|
list_del(&req->hr_list);
|
|
|
|
/*
|
|
* Requests on this list have not yet been
|
|
* accepted, so they do not have an fd to put.
|
|
*/
|
|
|
|
handshake_complete(req, -ETIMEDOUT, NULL);
|
|
}
|
|
}
|
|
|
|
static struct pernet_operations handshake_genl_net_ops = {
|
|
.init = handshake_net_init,
|
|
.exit = handshake_net_exit,
|
|
.id = &handshake_net_id,
|
|
.size = sizeof(struct handshake_net),
|
|
};
|
|
|
|
/**
|
|
* handshake_pernet - Get the handshake private per-net structure
|
|
* @net: network namespace
|
|
*
|
|
* Returns a pointer to the net's private per-net structure for the
|
|
* handshake module, or NULL if handshake_init() failed.
|
|
*/
|
|
struct handshake_net *handshake_pernet(struct net *net)
|
|
{
|
|
return handshake_net_id ?
|
|
net_generic(net, handshake_net_id) : NULL;
|
|
}
|
|
EXPORT_SYMBOL_IF_KUNIT(handshake_pernet);
|
|
|
|
static int __init handshake_init(void)
|
|
{
|
|
int ret;
|
|
|
|
ret = handshake_req_hash_init();
|
|
if (ret) {
|
|
pr_warn("handshake: hash initialization failed (%d)\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = genl_register_family(&handshake_nl_family);
|
|
if (ret) {
|
|
pr_warn("handshake: netlink registration failed (%d)\n", ret);
|
|
handshake_req_hash_destroy();
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* ORDER: register_pernet_subsys must be done last.
|
|
*
|
|
* If initialization does not make it past pernet_subsys
|
|
* registration, then handshake_net_id will remain 0. That
|
|
* shunts the handshake consumer API to return ENOTSUPP
|
|
* to prevent it from dereferencing something that hasn't
|
|
* been allocated.
|
|
*/
|
|
ret = register_pernet_subsys(&handshake_genl_net_ops);
|
|
if (ret) {
|
|
pr_warn("handshake: pernet registration failed (%d)\n", ret);
|
|
genl_unregister_family(&handshake_nl_family);
|
|
handshake_req_hash_destroy();
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void __exit handshake_exit(void)
|
|
{
|
|
unregister_pernet_subsys(&handshake_genl_net_ops);
|
|
handshake_net_id = 0;
|
|
|
|
handshake_req_hash_destroy();
|
|
genl_unregister_family(&handshake_nl_family);
|
|
}
|
|
|
|
module_init(handshake_init);
|
|
module_exit(handshake_exit);
|