mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-04-13 09:59:31 +00:00

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>
202 lines
4.7 KiB
C
202 lines
4.7 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/slab.h>
|
|
#include <linux/in.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/string.h>
|
|
#include <linux/sockios.h>
|
|
#include <linux/net.h>
|
|
#include <linux/spinlock.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/list.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/init.h>
|
|
|
|
static LIST_HEAD(ax25_dev_list);
|
|
DEFINE_SPINLOCK(ax25_dev_lock);
|
|
|
|
ax25_dev *ax25_addr_ax25dev(ax25_address *addr)
|
|
{
|
|
ax25_dev *ax25_dev, *res = NULL;
|
|
|
|
spin_lock_bh(&ax25_dev_lock);
|
|
list_for_each_entry(ax25_dev, &ax25_dev_list, list)
|
|
if (ax25cmp(addr, (const ax25_address *)ax25_dev->dev->dev_addr) == 0) {
|
|
res = ax25_dev;
|
|
ax25_dev_hold(ax25_dev);
|
|
break;
|
|
}
|
|
spin_unlock_bh(&ax25_dev_lock);
|
|
|
|
return res;
|
|
}
|
|
|
|
/*
|
|
* This is called when an interface is brought up. These are
|
|
* reasonable defaults.
|
|
*/
|
|
void ax25_dev_device_up(struct net_device *dev)
|
|
{
|
|
ax25_dev *ax25_dev;
|
|
|
|
ax25_dev = kzalloc(sizeof(*ax25_dev), GFP_KERNEL);
|
|
if (!ax25_dev) {
|
|
printk(KERN_ERR "AX.25: ax25_dev_device_up - out of memory\n");
|
|
return;
|
|
}
|
|
|
|
refcount_set(&ax25_dev->refcount, 1);
|
|
ax25_dev->dev = dev;
|
|
netdev_hold(dev, &ax25_dev->dev_tracker, GFP_KERNEL);
|
|
ax25_dev->forward = NULL;
|
|
ax25_dev->device_up = true;
|
|
|
|
ax25_dev->values[AX25_VALUES_IPDEFMODE] = AX25_DEF_IPDEFMODE;
|
|
ax25_dev->values[AX25_VALUES_AXDEFMODE] = AX25_DEF_AXDEFMODE;
|
|
ax25_dev->values[AX25_VALUES_BACKOFF] = AX25_DEF_BACKOFF;
|
|
ax25_dev->values[AX25_VALUES_CONMODE] = AX25_DEF_CONMODE;
|
|
ax25_dev->values[AX25_VALUES_WINDOW] = AX25_DEF_WINDOW;
|
|
ax25_dev->values[AX25_VALUES_EWINDOW] = AX25_DEF_EWINDOW;
|
|
ax25_dev->values[AX25_VALUES_T1] = AX25_DEF_T1;
|
|
ax25_dev->values[AX25_VALUES_T2] = AX25_DEF_T2;
|
|
ax25_dev->values[AX25_VALUES_T3] = AX25_DEF_T3;
|
|
ax25_dev->values[AX25_VALUES_IDLE] = AX25_DEF_IDLE;
|
|
ax25_dev->values[AX25_VALUES_N2] = AX25_DEF_N2;
|
|
ax25_dev->values[AX25_VALUES_PACLEN] = AX25_DEF_PACLEN;
|
|
ax25_dev->values[AX25_VALUES_PROTOCOL] = AX25_DEF_PROTOCOL;
|
|
|
|
#ifdef CONFIG_AX25_DAMA_SLAVE
|
|
ax25_dev->values[AX25_VALUES_DS_TIMEOUT]= AX25_DEF_DS_TIMEOUT;
|
|
#endif
|
|
|
|
#if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER)
|
|
ax25_ds_setup_timer(ax25_dev);
|
|
#endif
|
|
|
|
spin_lock_bh(&ax25_dev_lock);
|
|
list_add(&ax25_dev->list, &ax25_dev_list);
|
|
rcu_assign_pointer(dev->ax25_ptr, ax25_dev);
|
|
spin_unlock_bh(&ax25_dev_lock);
|
|
|
|
ax25_register_dev_sysctl(ax25_dev);
|
|
}
|
|
|
|
void ax25_dev_device_down(struct net_device *dev)
|
|
{
|
|
ax25_dev *s, *ax25_dev;
|
|
|
|
if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL)
|
|
return;
|
|
|
|
ax25_unregister_dev_sysctl(ax25_dev);
|
|
|
|
spin_lock_bh(&ax25_dev_lock);
|
|
|
|
#ifdef CONFIG_AX25_DAMA_SLAVE
|
|
timer_shutdown_sync(&ax25_dev->dama.slave_timer);
|
|
#endif
|
|
|
|
/*
|
|
* Remove any packet forwarding that points to this device.
|
|
*/
|
|
list_for_each_entry(s, &ax25_dev_list, list)
|
|
if (s->forward == dev)
|
|
s->forward = NULL;
|
|
|
|
list_for_each_entry(s, &ax25_dev_list, list) {
|
|
if (s == ax25_dev) {
|
|
list_del(&s->list);
|
|
break;
|
|
}
|
|
}
|
|
|
|
RCU_INIT_POINTER(dev->ax25_ptr, NULL);
|
|
spin_unlock_bh(&ax25_dev_lock);
|
|
netdev_put(dev, &ax25_dev->dev_tracker);
|
|
ax25_dev_put(ax25_dev);
|
|
}
|
|
|
|
int ax25_fwd_ioctl(unsigned int cmd, struct ax25_fwd_struct *fwd)
|
|
{
|
|
ax25_dev *ax25_dev, *fwd_dev;
|
|
|
|
if ((ax25_dev = ax25_addr_ax25dev(&fwd->port_from)) == NULL)
|
|
return -EINVAL;
|
|
|
|
switch (cmd) {
|
|
case SIOCAX25ADDFWD:
|
|
fwd_dev = ax25_addr_ax25dev(&fwd->port_to);
|
|
if (!fwd_dev) {
|
|
ax25_dev_put(ax25_dev);
|
|
return -EINVAL;
|
|
}
|
|
if (ax25_dev->forward) {
|
|
ax25_dev_put(fwd_dev);
|
|
ax25_dev_put(ax25_dev);
|
|
return -EINVAL;
|
|
}
|
|
ax25_dev->forward = fwd_dev->dev;
|
|
ax25_dev_put(fwd_dev);
|
|
ax25_dev_put(ax25_dev);
|
|
break;
|
|
|
|
case SIOCAX25DELFWD:
|
|
if (!ax25_dev->forward) {
|
|
ax25_dev_put(ax25_dev);
|
|
return -EINVAL;
|
|
}
|
|
ax25_dev->forward = NULL;
|
|
ax25_dev_put(ax25_dev);
|
|
break;
|
|
|
|
default:
|
|
ax25_dev_put(ax25_dev);
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct net_device *ax25_fwd_dev(struct net_device *dev)
|
|
{
|
|
ax25_dev *ax25_dev;
|
|
|
|
if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL)
|
|
return dev;
|
|
|
|
if (ax25_dev->forward == NULL)
|
|
return dev;
|
|
|
|
return ax25_dev->forward;
|
|
}
|
|
|
|
/*
|
|
* Free all memory associated with device structures.
|
|
*/
|
|
void __exit ax25_dev_free(void)
|
|
{
|
|
ax25_dev *s, *n;
|
|
|
|
spin_lock_bh(&ax25_dev_lock);
|
|
list_for_each_entry_safe(s, n, &ax25_dev_list, list) {
|
|
netdev_put(s->dev, &s->dev_tracker);
|
|
list_del(&s->list);
|
|
ax25_dev_put(s);
|
|
}
|
|
spin_unlock_bh(&ax25_dev_lock);
|
|
}
|