syzbot found a lockdep issue [1].
We should remove ax25 RTNL dependency in ax25_setsockopt()
This should also fix a variety of possible UAF in ax25.
[1]
WARNING: possible circular locking dependency detected
6.13.0-rc3-syzkaller-00762-g9268abe611b0 #0 Not tainted
------------------------------------------------------
syz.5.1818/12806 is trying to acquire lock:
ffffffff8fcb3988 (rtnl_mutex){+.+.}-{4:4}, at: ax25_setsockopt+0xa55/0xe90 net/ax25/af_ax25.c:680
but task is already holding lock:
ffff8880617ac258 (sk_lock-AF_AX25){+.+.}-{0:0}, at: lock_sock include/net/sock.h:1618 [inline]
ffff8880617ac258 (sk_lock-AF_AX25){+.+.}-{0:0}, at: ax25_setsockopt+0x209/0xe90 net/ax25/af_ax25.c:574
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (sk_lock-AF_AX25){+.+.}-{0:0}:
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5849
lock_sock_nested+0x48/0x100 net/core/sock.c:3642
lock_sock include/net/sock.h:1618 [inline]
ax25_kill_by_device net/ax25/af_ax25.c:101 [inline]
ax25_device_event+0x24d/0x580 net/ax25/af_ax25.c:146
notifier_call_chain+0x1a5/0x3f0 kernel/notifier.c:85
__dev_notify_flags+0x207/0x400
dev_change_flags+0xf0/0x1a0 net/core/dev.c:9026
dev_ifsioc+0x7c8/0xe70 net/core/dev_ioctl.c:563
dev_ioctl+0x719/0x1340 net/core/dev_ioctl.c:820
sock_do_ioctl+0x240/0x460 net/socket.c:1234
sock_ioctl+0x626/0x8e0 net/socket.c:1339
vfs_ioctl fs/ioctl.c:51 [inline]
__do_sys_ioctl fs/ioctl.c:906 [inline]
__se_sys_ioctl+0xf5/0x170 fs/ioctl.c:892
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
-> #0 (rtnl_mutex){+.+.}-{4:4}:
check_prev_add kernel/locking/lockdep.c:3161 [inline]
check_prevs_add kernel/locking/lockdep.c:3280 [inline]
validate_chain+0x18ef/0x5920 kernel/locking/lockdep.c:3904
__lock_acquire+0x1397/0x2100 kernel/locking/lockdep.c:5226
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5849
__mutex_lock_common kernel/locking/mutex.c:585 [inline]
__mutex_lock+0x1ac/0xee0 kernel/locking/mutex.c:735
ax25_setsockopt+0xa55/0xe90 net/ax25/af_ax25.c:680
do_sock_setsockopt+0x3af/0x720 net/socket.c:2324
__sys_setsockopt net/socket.c:2349 [inline]
__do_sys_setsockopt net/socket.c:2355 [inline]
__se_sys_setsockopt net/socket.c:2352 [inline]
__x64_sys_setsockopt+0x1ee/0x280 net/socket.c:2352
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(sk_lock-AF_AX25);
lock(rtnl_mutex);
lock(sk_lock-AF_AX25);
lock(rtnl_mutex);
*** DEADLOCK ***
1 lock held by syz.5.1818/12806:
#0: ffff8880617ac258 (sk_lock-AF_AX25){+.+.}-{0:0}, at: lock_sock include/net/sock.h:1618 [inline]
#0: ffff8880617ac258 (sk_lock-AF_AX25){+.+.}-{0:0}, at: ax25_setsockopt+0x209/0xe90 net/ax25/af_ax25.c:574
stack backtrace:
CPU: 1 UID: 0 PID: 12806 Comm: syz.5.1818 Not tainted 6.13.0-rc3-syzkaller-00762-g9268abe611b0 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024
Call Trace:
<TASK>
__dump_stack lib/dump_stack.c:94 [inline]
dump_stack_lvl+0x241/0x360 lib/dump_stack.c:120
print_circular_bug+0x13a/0x1b0 kernel/locking/lockdep.c:2074
check_noncircular+0x36a/0x4a0 kernel/locking/lockdep.c:2206
check_prev_add kernel/locking/lockdep.c:3161 [inline]
check_prevs_add kernel/locking/lockdep.c:3280 [inline]
validate_chain+0x18ef/0x5920 kernel/locking/lockdep.c:3904
__lock_acquire+0x1397/0x2100 kernel/locking/lockdep.c:5226
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5849
__mutex_lock_common kernel/locking/mutex.c:585 [inline]
__mutex_lock+0x1ac/0xee0 kernel/locking/mutex.c:735
ax25_setsockopt+0xa55/0xe90 net/ax25/af_ax25.c:680
do_sock_setsockopt+0x3af/0x720 net/socket.c:2324
__sys_setsockopt net/socket.c:2349 [inline]
__do_sys_setsockopt net/socket.c:2355 [inline]
__se_sys_setsockopt net/socket.c:2352 [inline]
__x64_sys_setsockopt+0x1ee/0x280 net/socket.c:2352
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7f7b62385d29
Fixes: c433570458
("ax25: fix a use-after-free in ax25_fillin_cb()")
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250103210514.87290-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
247 lines
5.3 KiB
C
247 lines
5.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
*
|
|
* Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
|
|
*/
|
|
#include <linux/errno.h>
|
|
#include <linux/types.h>
|
|
#include <linux/socket.h>
|
|
#include <linux/in.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/string.h>
|
|
#include <linux/sockios.h>
|
|
#include <linux/net.h>
|
|
#include <linux/slab.h>
|
|
#include <net/ax25.h>
|
|
#include <linux/inet.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/if_arp.h>
|
|
#include <linux/skbuff.h>
|
|
#include <net/sock.h>
|
|
#include <linux/uaccess.h>
|
|
#include <linux/fcntl.h>
|
|
#include <linux/termios.h> /* For TIOCINQ/OUTQ */
|
|
#include <linux/mm.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/notifier.h>
|
|
#include <linux/proc_fs.h>
|
|
#include <linux/stat.h>
|
|
#include <linux/sysctl.h>
|
|
#include <net/ip.h>
|
|
#include <net/arp.h>
|
|
|
|
/*
|
|
* IP over AX.25 encapsulation.
|
|
*/
|
|
|
|
/*
|
|
* Shove an AX.25 UI header on an IP packet and handle ARP
|
|
*/
|
|
|
|
#ifdef CONFIG_INET
|
|
|
|
static int ax25_hard_header(struct sk_buff *skb, struct net_device *dev,
|
|
unsigned short type, const void *daddr,
|
|
const void *saddr, unsigned int len)
|
|
{
|
|
unsigned char *buff;
|
|
|
|
/* they sometimes come back to us... */
|
|
if (type == ETH_P_AX25)
|
|
return 0;
|
|
|
|
/* header is an AX.25 UI frame from us to them */
|
|
buff = skb_push(skb, AX25_HEADER_LEN);
|
|
*buff++ = 0x00; /* KISS DATA */
|
|
|
|
if (daddr != NULL)
|
|
memcpy(buff, daddr, dev->addr_len); /* Address specified */
|
|
|
|
buff[6] &= ~AX25_CBIT;
|
|
buff[6] &= ~AX25_EBIT;
|
|
buff[6] |= AX25_SSSID_SPARE;
|
|
buff += AX25_ADDR_LEN;
|
|
|
|
if (saddr != NULL)
|
|
memcpy(buff, saddr, dev->addr_len);
|
|
else
|
|
memcpy(buff, dev->dev_addr, dev->addr_len);
|
|
|
|
buff[6] &= ~AX25_CBIT;
|
|
buff[6] |= AX25_EBIT;
|
|
buff[6] |= AX25_SSSID_SPARE;
|
|
buff += AX25_ADDR_LEN;
|
|
|
|
*buff++ = AX25_UI; /* UI */
|
|
|
|
/* Append a suitable AX.25 PID */
|
|
switch (type) {
|
|
case ETH_P_IP:
|
|
*buff++ = AX25_P_IP;
|
|
break;
|
|
case ETH_P_ARP:
|
|
*buff++ = AX25_P_ARP;
|
|
break;
|
|
default:
|
|
printk(KERN_ERR "AX.25: ax25_hard_header - wrong protocol type 0x%2.2x\n", type);
|
|
*buff++ = 0;
|
|
break;
|
|
}
|
|
|
|
if (daddr != NULL)
|
|
return AX25_HEADER_LEN;
|
|
|
|
return -AX25_HEADER_LEN; /* Unfinished header */
|
|
}
|
|
|
|
netdev_tx_t ax25_ip_xmit(struct sk_buff *skb)
|
|
{
|
|
struct sk_buff *ourskb;
|
|
unsigned char *bp = skb->data;
|
|
ax25_route *route;
|
|
struct net_device *dev = NULL;
|
|
ax25_address *src, *dst;
|
|
ax25_digi *digipeat = NULL;
|
|
ax25_dev *ax25_dev;
|
|
ax25_cb *ax25;
|
|
char ip_mode = ' ';
|
|
|
|
dst = (ax25_address *)(bp + 1);
|
|
src = (ax25_address *)(bp + 8);
|
|
|
|
ax25_route_lock_use();
|
|
route = ax25_get_route(dst, NULL);
|
|
if (route) {
|
|
digipeat = route->digipeat;
|
|
dev = route->dev;
|
|
ip_mode = route->ip_mode;
|
|
}
|
|
|
|
if (dev == NULL)
|
|
dev = skb->dev;
|
|
|
|
rcu_read_lock();
|
|
if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL) {
|
|
kfree_skb(skb);
|
|
goto put;
|
|
}
|
|
|
|
if (bp[16] == AX25_P_IP) {
|
|
if (ip_mode == 'V' || (ip_mode == ' ' && ax25_dev->values[AX25_VALUES_IPDEFMODE])) {
|
|
/*
|
|
* We copy the buffer and release the original thereby
|
|
* keeping it straight
|
|
*
|
|
* Note: we report 1 back so the caller will
|
|
* not feed the frame direct to the physical device
|
|
* We don't want that to happen. (It won't be upset
|
|
* as we have pulled the frame from the queue by
|
|
* freeing it).
|
|
*
|
|
* NB: TCP modifies buffers that are still
|
|
* on a device queue, thus we use skb_copy()
|
|
* instead of using skb_clone() unless this
|
|
* gets fixed.
|
|
*/
|
|
|
|
ax25_address src_c;
|
|
ax25_address dst_c;
|
|
|
|
if ((ourskb = skb_copy(skb, GFP_ATOMIC)) == NULL) {
|
|
kfree_skb(skb);
|
|
goto put;
|
|
}
|
|
|
|
if (skb->sk != NULL)
|
|
skb_set_owner_w(ourskb, skb->sk);
|
|
|
|
kfree_skb(skb);
|
|
/* dl9sau: bugfix
|
|
* after kfree_skb(), dst and src which were pointer
|
|
* to bp which is part of skb->data would not be valid
|
|
* anymore hope that after skb_pull(ourskb, ..) our
|
|
* dsc_c and src_c will not become invalid
|
|
*/
|
|
bp = ourskb->data;
|
|
dst_c = *(ax25_address *)(bp + 1);
|
|
src_c = *(ax25_address *)(bp + 8);
|
|
|
|
skb_pull(ourskb, AX25_HEADER_LEN - 1); /* Keep PID */
|
|
skb_reset_network_header(ourskb);
|
|
|
|
ax25=ax25_send_frame(
|
|
ourskb,
|
|
ax25_dev->values[AX25_VALUES_PACLEN],
|
|
&src_c,
|
|
&dst_c, digipeat, dev);
|
|
if (ax25) {
|
|
ax25_cb_put(ax25);
|
|
}
|
|
goto put;
|
|
}
|
|
}
|
|
|
|
bp[7] &= ~AX25_CBIT;
|
|
bp[7] &= ~AX25_EBIT;
|
|
bp[7] |= AX25_SSSID_SPARE;
|
|
|
|
bp[14] &= ~AX25_CBIT;
|
|
bp[14] |= AX25_EBIT;
|
|
bp[14] |= AX25_SSSID_SPARE;
|
|
|
|
skb_pull(skb, AX25_KISS_HEADER_LEN);
|
|
|
|
if (digipeat != NULL) {
|
|
if ((ourskb = ax25_rt_build_path(skb, src, dst, route->digipeat)) == NULL)
|
|
goto put;
|
|
|
|
skb = ourskb;
|
|
}
|
|
|
|
ax25_queue_xmit(skb, dev);
|
|
|
|
put:
|
|
rcu_read_unlock();
|
|
ax25_route_lock_unuse();
|
|
return NETDEV_TX_OK;
|
|
}
|
|
|
|
#else /* INET */
|
|
|
|
static int ax25_hard_header(struct sk_buff *skb, struct net_device *dev,
|
|
unsigned short type, const void *daddr,
|
|
const void *saddr, unsigned int len)
|
|
{
|
|
return -AX25_HEADER_LEN;
|
|
}
|
|
|
|
netdev_tx_t ax25_ip_xmit(struct sk_buff *skb)
|
|
{
|
|
kfree_skb(skb);
|
|
return NETDEV_TX_OK;
|
|
}
|
|
#endif
|
|
|
|
static bool ax25_validate_header(const char *header, unsigned int len)
|
|
{
|
|
ax25_digi digi;
|
|
|
|
if (!len)
|
|
return false;
|
|
|
|
if (header[0])
|
|
return true;
|
|
|
|
return ax25_addr_parse(header + 1, len - 1, NULL, NULL, &digi, NULL,
|
|
NULL);
|
|
}
|
|
|
|
const struct header_ops ax25_header_ops = {
|
|
.create = ax25_hard_header,
|
|
.validate = ax25_validate_header,
|
|
};
|
|
|
|
EXPORT_SYMBOL(ax25_header_ops);
|
|
EXPORT_SYMBOL(ax25_ip_xmit);
|