From 30c4ae2eedacfbb99ce91d04f6232e7c26e498dd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 8 May 2024 19:45:38 +0200 Subject: Merging debian version 5.10.216-1. Signed-off-by: Daniel Baumann --- .../0223-ptrace-fix-ptrace-vs-tasklist_lock-race.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'debian/patches-rt/0223-ptrace-fix-ptrace-vs-tasklist_lock-race.patch') diff --git a/debian/patches-rt/0223-ptrace-fix-ptrace-vs-tasklist_lock-race.patch b/debian/patches-rt/0223-ptrace-fix-ptrace-vs-tasklist_lock-race.patch index efff232da..c2cfa07bf 100644 --- a/debian/patches-rt/0223-ptrace-fix-ptrace-vs-tasklist_lock-race.patch +++ b/debian/patches-rt/0223-ptrace-fix-ptrace-vs-tasklist_lock-race.patch @@ -1,8 +1,8 @@ -From 2b742ac53e22db703a46b21ff3817c797b7cb071 Mon Sep 17 00:00:00 2001 +From 27d5c6ef64ac2461259d6edd971b61408e4bfda4 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Thu, 29 Aug 2013 18:21:04 +0200 Subject: [PATCH 223/323] ptrace: fix ptrace vs tasklist_lock race -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz As explained by Alexander Fyodorov : @@ -31,7 +31,7 @@ Signed-off-by: Sebastian Andrzej Siewior 3 files changed, 68 insertions(+), 7 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h -index d259126f46cf..bd0c9c633438 100644 +index d259126f46cf4..bd0c9c633438a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -112,12 +112,8 @@ struct io_uring_task; @@ -100,7 +100,7 @@ index d259126f46cf..bd0c9c633438 100644 * cond_resched() and cond_resched_lock(): latency reduction via * explicit rescheduling in places that are safe. The return diff --git a/kernel/ptrace.c b/kernel/ptrace.c -index aab480e24bd6..71acb6341e63 100644 +index aab480e24bd60..71acb6341e639 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -196,7 +196,14 @@ static bool ptrace_freeze_traced(struct task_struct *task) @@ -120,7 +120,7 @@ index aab480e24bd6..71acb6341e63 100644 } spin_unlock_irq(&task->sighand->siglock); diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 2f689b4fa68b..8ac1f0526476 100644 +index 2f689b4fa68b5..8ac1f0526476f 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2587,6 +2587,18 @@ int migrate_swap(struct task_struct *cur, struct task_struct *p, @@ -162,5 +162,5 @@ index 2f689b4fa68b..8ac1f0526476 100644 task_rq_unlock(rq, p, &rf); -- -2.43.0 +2.44.0 -- cgit v1.2.3