* [PATCH net 0/2] Fix UAF bugs caused by ax25_release()
@ 2022-03-28 13:00 Duoming Zhou
2022-03-28 13:00 ` [PATCH net 1/2 V2] ax25: fix UAF bug in ax25_send_control() Duoming Zhou
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Duoming Zhou @ 2022-03-28 13:00 UTC (permalink / raw)
To: linux-hams
Cc: netdev, linux-kernel, pabeni, kuba, davem, ralf, jreuter,
dan.carpenter, Duoming Zhou
The first patch fixes UAF bugs in ax25_send_control, and
the second patch fixes UAF bugs in ax25 timers.
Duoming Zhou (2):
ax25: fix UAF bug in ax25_send_control()
ax25: Fix UAF bugs in ax25 timers
net/ax25/af_ax25.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net 1/2 V2] ax25: fix UAF bug in ax25_send_control()
2022-03-28 13:00 [PATCH net 0/2] Fix UAF bugs caused by ax25_release() Duoming Zhou
@ 2022-03-28 13:00 ` Duoming Zhou
2022-03-28 13:00 ` [PATCH net 2/2] ax25: Fix UAF bugs in ax25 timers Duoming Zhou
2022-03-29 8:50 ` [PATCH net 0/2] Fix UAF bugs caused by ax25_release() patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Duoming Zhou @ 2022-03-28 13:00 UTC (permalink / raw)
To: linux-hams
Cc: netdev, linux-kernel, pabeni, kuba, davem, ralf, jreuter,
dan.carpenter, Duoming Zhou
There are UAF bugs in ax25_send_control(), when we call ax25_release()
to deallocate ax25_dev. The possible race condition is shown below:
(Thread 1) | (Thread 2)
ax25_dev_device_up() //(1) |
| ax25_kill_by_device()
ax25_bind() //(2) |
ax25_connect() | ...
ax25->state = AX25_STATE_1 |
... | ax25_dev_device_down() //(3)
(Thread 3)
ax25_release() |
ax25_dev_put() //(4) FREE |
case AX25_STATE_1: |
ax25_send_control() |
alloc_skb() //USE |
The refcount of ax25_dev increases in position (1) and (2), and
decreases in position (3) and (4). The ax25_dev will be freed
before dereference sites in ax25_send_control().
The following is part of the report:
[ 102.297448] BUG: KASAN: use-after-free in ax25_send_control+0x33/0x210
[ 102.297448] Read of size 8 at addr ffff888009e6e408 by task ax25_close/602
[ 102.297448] Call Trace:
[ 102.303751] ax25_send_control+0x33/0x210
[ 102.303751] ax25_release+0x356/0x450
[ 102.305431] __sock_release+0x6d/0x120
[ 102.305431] sock_close+0xf/0x20
[ 102.305431] __fput+0x11f/0x420
[ 102.305431] task_work_run+0x86/0xd0
[ 102.307130] get_signal+0x1075/0x1220
[ 102.308253] arch_do_signal_or_restart+0x1df/0xc00
[ 102.308253] exit_to_user_mode_prepare+0x150/0x1e0
[ 102.308253] syscall_exit_to_user_mode+0x19/0x50
[ 102.308253] do_syscall_64+0x48/0x90
[ 102.308253] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 102.308253] RIP: 0033:0x405ae7
This patch defers the free operation of ax25_dev and net_device after
all corresponding dereference sites in ax25_release() to avoid UAF.
Fixes: 9fd75b66b8f6 ("ax25: Fix refcount leaks caused by ax25_cb_del()")
Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
---
Changes in V2:
- Make commit message more clearer.
net/ax25/af_ax25.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 992b6e5d85d..f5686c463bc 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -991,10 +991,6 @@ static int ax25_release(struct socket *sock)
sock_orphan(sk);
ax25 = sk_to_ax25(sk);
ax25_dev = ax25->ax25_dev;
- if (ax25_dev) {
- dev_put_track(ax25_dev->dev, &ax25_dev->dev_tracker);
- ax25_dev_put(ax25_dev);
- }
if (sk->sk_type == SOCK_SEQPACKET) {
switch (ax25->state) {
@@ -1056,6 +1052,10 @@ static int ax25_release(struct socket *sock)
sk->sk_state_change(sk);
ax25_destroy_socket(ax25);
}
+ if (ax25_dev) {
+ dev_put_track(ax25_dev->dev, &ax25_dev->dev_tracker);
+ ax25_dev_put(ax25_dev);
+ }
sock->sk = NULL;
release_sock(sk);
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net 2/2] ax25: Fix UAF bugs in ax25 timers
2022-03-28 13:00 [PATCH net 0/2] Fix UAF bugs caused by ax25_release() Duoming Zhou
2022-03-28 13:00 ` [PATCH net 1/2 V2] ax25: fix UAF bug in ax25_send_control() Duoming Zhou
@ 2022-03-28 13:00 ` Duoming Zhou
2022-03-29 8:50 ` [PATCH net 0/2] Fix UAF bugs caused by ax25_release() patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Duoming Zhou @ 2022-03-28 13:00 UTC (permalink / raw)
To: linux-hams
Cc: netdev, linux-kernel, pabeni, kuba, davem, ralf, jreuter,
dan.carpenter, Duoming Zhou
There are race conditions that may lead to UAF bugs in
ax25_heartbeat_expiry(), ax25_t1timer_expiry(), ax25_t2timer_expiry(),
ax25_t3timer_expiry() and ax25_idletimer_expiry(), when we call
ax25_release() to deallocate ax25_dev.
One of the UAF bugs caused by ax25_release() is shown below:
(Thread 1) | (Thread 2)
ax25_dev_device_up() //(1) |
... | ax25_kill_by_device()
ax25_bind() //(2) |
ax25_connect() | ...
ax25_std_establish_data_link() |
ax25_start_t1timer() | ax25_dev_device_down() //(3)
mod_timer(&ax25->t1timer,..) |
| ax25_release()
(wait a time) | ...
| ax25_dev_put(ax25_dev) //(4)FREE
ax25_t1timer_expiry() |
ax25->ax25_dev->values[..] //USE| ...
... |
We increase the refcount of ax25_dev in position (1) and (2), and
decrease the refcount of ax25_dev in position (3) and (4).
The ax25_dev will be freed in position (4) and be used in
ax25_t1timer_expiry().
The fail log is shown below:
==============================================================
[ 106.116942] BUG: KASAN: use-after-free in ax25_t1timer_expiry+0x1c/0x60
[ 106.116942] Read of size 8 at addr ffff88800bda9028 by task swapper/0/0
[ 106.116942] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.17.0-06123-g0905eec574
[ 106.116942] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-14
[ 106.116942] Call Trace:
...
[ 106.116942] ax25_t1timer_expiry+0x1c/0x60
[ 106.116942] call_timer_fn+0x122/0x3d0
[ 106.116942] __run_timers.part.0+0x3f6/0x520
[ 106.116942] run_timer_softirq+0x4f/0xb0
[ 106.116942] __do_softirq+0x1c2/0x651
...
This patch adds del_timer_sync() in ax25_release(), which could ensure
that all timers stop before we deallocate ax25_dev.
Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
---
net/ax25/af_ax25.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index f5686c463bc..363d47f9453 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1053,6 +1053,11 @@ static int ax25_release(struct socket *sock)
ax25_destroy_socket(ax25);
}
if (ax25_dev) {
+ del_timer_sync(&ax25->timer);
+ del_timer_sync(&ax25->t1timer);
+ del_timer_sync(&ax25->t2timer);
+ del_timer_sync(&ax25->t3timer);
+ del_timer_sync(&ax25->idletimer);
dev_put_track(ax25_dev->dev, &ax25_dev->dev_tracker);
ax25_dev_put(ax25_dev);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net 0/2] Fix UAF bugs caused by ax25_release()
2022-03-28 13:00 [PATCH net 0/2] Fix UAF bugs caused by ax25_release() Duoming Zhou
2022-03-28 13:00 ` [PATCH net 1/2 V2] ax25: fix UAF bug in ax25_send_control() Duoming Zhou
2022-03-28 13:00 ` [PATCH net 2/2] ax25: Fix UAF bugs in ax25 timers Duoming Zhou
@ 2022-03-29 8:50 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-03-29 8:50 UTC (permalink / raw)
To: Duoming Zhou
Cc: linux-hams, netdev, linux-kernel, pabeni, kuba, davem, ralf,
jreuter, dan.carpenter
Hello:
This series was applied to netdev/net.git (master)
by Paolo Abeni <pabeni@redhat.com>:
On Mon, 28 Mar 2022 21:00:13 +0800 you wrote:
> The first patch fixes UAF bugs in ax25_send_control, and
> the second patch fixes UAF bugs in ax25 timers.
>
> Duoming Zhou (2):
> ax25: fix UAF bug in ax25_send_control()
> ax25: Fix UAF bugs in ax25 timers
>
> [...]
Here is the summary with links:
- [net,1/2,V2] ax25: fix UAF bug in ax25_send_control()
https://git.kernel.org/netdev/net/c/5352a7613083
- [net,2/2] ax25: Fix UAF bugs in ax25 timers
https://git.kernel.org/netdev/net/c/82e31755e55f
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-29 8:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-28 13:00 [PATCH net 0/2] Fix UAF bugs caused by ax25_release() Duoming Zhou
2022-03-28 13:00 ` [PATCH net 1/2 V2] ax25: fix UAF bug in ax25_send_control() Duoming Zhou
2022-03-28 13:00 ` [PATCH net 2/2] ax25: Fix UAF bugs in ax25 timers Duoming Zhou
2022-03-29 8:50 ` [PATCH net 0/2] Fix UAF bugs caused by ax25_release() patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).