Skip to content
Commit c2fc6443 authored by Geliang Tang's avatar Geliang Tang Committed by Liu Jian
Browse files

mptcp: add sk_stop_timer_sync helper

stable inclusion
from stable-v4.19.312
commit 9c382bc16fa8f7499b0663398437e125cf4f763b
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9QG5Z
CVE: CVE-2024-35910

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9c382bc16fa8f7499b0663398437e125cf4f763b



---------------------------

[ Upstream commit 08b81d87 ]

This patch added a new helper sk_stop_timer_sync, it deactivates a timer
like sk_stop_timer, but waits for the handler to finish.

Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: 151c9c724d05 ("tcp: properly terminate timers for kernel sockets")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>

Conflicts:
	net/core/sock.c
[This is because we backport 584f3742.]
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
parent 23ae7e1b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment