[PATCH net] sctp: fix addr_wq_timer race in sctp_free_addr_wq()

[PATCH net] sctp: fix addr_wq_timer race in sctp_free_addr_wq()

[Xin Long]

sctp_free_addr_wq() previously removed addr_wq_timer using timer_delete()
while holding addr_wq_lock. However, timer_delete() does not guarantee that
a currently running timer handler has completed.

This allows a race with sctp_addr_wq_timeout_handler(), where the handler
may still run after addr_waitq has been freed, acquire addr_wq_lock, and
access freed memory, leading to a use-after-free.

Fix this by calling timer_shutdown_sync() before taking addr_wq_lock.  This
guarantees that any in-flight timer handler has finished and prevents the
timer from being re-armed during teardown, making subsequent cleanup safe.

Fixes: 4db67e808640 ("sctp: Make the address lists per network namespace")
Reported-by: Sashiko <sashiko-bot@kernel.org>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
 net/sctp/protocol.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 587b0017a67d..cf335494bffe 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -663,8 +663,9 @@ static void sctp_free_addr_wq(struct net *net)
 	struct sctp_sockaddr_entry *addrw;
 	struct sctp_sockaddr_entry *temp;
 
+	timer_shutdown_sync(&net->sctp.addr_wq_timer);
+
 	spin_lock_bh(&net->sctp.addr_wq_lock);
-	timer_delete(&net->sctp.addr_wq_timer);
 	list_for_each_entry_safe(addrw, temp, &net->sctp.addr_waitq, list) {
 		list_del(&addrw->list);
 		kfree(addrw);
-- 
2.47.1

Re: [PATCH net] sctp: fix addr_wq_timer race in sctp_free_addr_wq()

[Jakub Kicinski]

On Fri, 10 Jul 2026 14:23:43 -0400 Xin Long wrote:
> sctp_free_addr_wq() previously removed addr_wq_timer using timer_delete()
> while holding addr_wq_lock. However, timer_delete() does not guarantee that
> a currently running timer handler has completed.
> 
> This allows a race with sctp_addr_wq_timeout_handler(), where the handler
> may still run after addr_waitq has been freed, acquire addr_wq_lock, and
> access freed memory, leading to a use-after-free.
> 
> Fix this by calling timer_shutdown_sync() before taking addr_wq_lock.  This
> guarantees that any in-flight timer handler has finished and prevents the
> timer from being re-armed during teardown, making subsequent cleanup safe.

This version did not apply when it was posted (IDK if it applies now)
Please rebase and repost if it's still needed?
-- 
pw-bot: cr

Re: [PATCH net] sctp: fix addr_wq_timer race in sctp_free_addr_wq()

[Xin Long]

On Tue, Jul 21, 2026 at 5:02 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Fri, 10 Jul 2026 14:23:43 -0400 Xin Long wrote:
> > sctp_free_addr_wq() previously removed addr_wq_timer using timer_delete()
> > while holding addr_wq_lock. However, timer_delete() does not guarantee that
> > a currently running timer handler has completed.
> >
> > This allows a race with sctp_addr_wq_timeout_handler(), where the handler
> > may still run after addr_waitq has been freed, acquire addr_wq_lock, and
> > access freed memory, leading to a use-after-free.
> >
> > Fix this by calling timer_shutdown_sync() before taking addr_wq_lock.  This
> > guarantees that any in-flight timer handler has finished and prevents the
> > timer from being re-armed during teardown, making subsequent cleanup safe.
>
> This version did not apply when it was posted (IDK if it applies now)
> Please rebase and repost if it's still needed?
You already applied this one:

https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=976c19de0f22a857ba0112f39635f8fd7a257568

I think I accidently posted this one twice, sorry for the confusion.

We can drop this dup one.

Thanks.

[PATCH net] sctp: fix addr_wq_timer race in sctp_free_addr_wq()

[Xin Long]

sctp_free_addr_wq() previously removed addr_wq_timer using timer_delete()
while holding addr_wq_lock. However, timer_delete() does not guarantee that
a currently running timer handler has completed.

This allows a race with sctp_addr_wq_timeout_handler(), where the handler
may still run after addr_waitq has been freed, acquire addr_wq_lock, and
access freed memory, leading to a use-after-free.

Fix this by calling timer_shutdown_sync() before taking addr_wq_lock.  This
guarantees that any in-flight timer handler has finished and prevents the
timer from being re-armed during teardown, making subsequent cleanup safe.

Fixes: 4db67e808640 ("sctp: Make the address lists per network namespace")
Reported-by: Sashiko <sashiko-bot@kernel.org>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
 net/sctp/protocol.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 587b0017a67d..cf335494bffe 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -663,8 +663,9 @@ static void sctp_free_addr_wq(struct net *net)
 	struct sctp_sockaddr_entry *addrw;
 	struct sctp_sockaddr_entry *temp;
 
+	timer_shutdown_sync(&net->sctp.addr_wq_timer);
+
 	spin_lock_bh(&net->sctp.addr_wq_lock);
-	timer_delete(&net->sctp.addr_wq_timer);
 	list_for_each_entry_safe(addrw, temp, &net->sctp.addr_waitq, list) {
 		list_del(&addrw->list);
 		kfree(addrw);
-- 
2.47.1

Re: [PATCH net] sctp: fix addr_wq_timer race in sctp_free_addr_wq()

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Mon, 29 Jun 2026 14:31:14 -0400 you wrote:
> sctp_free_addr_wq() previously removed addr_wq_timer using timer_delete()
> while holding addr_wq_lock. However, timer_delete() does not guarantee that
> a currently running timer handler has completed.
> 
> This allows a race with sctp_addr_wq_timeout_handler(), where the handler
> may still run after addr_waitq has been freed, acquire addr_wq_lock, and
> access freed memory, leading to a use-after-free.
> 
> [...]

Here is the summary with links:
  - [net] sctp: fix addr_wq_timer race in sctp_free_addr_wq()
    https://git.kernel.org/netdev/net/c/976c19de0f22

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html