From: Greg Kroah-Hartman Date: Fri, 23 May 2025 12:37:56 +0000 (+0200) Subject: fuzz cleanup X-Git-Tag: v6.12.31~78 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71ea03905d96af45fbbd377b7ea848e5ea5f2b39;p=thirdparty%2Fkernel%2Fstable-queue.git fuzz cleanup --- diff --git a/queue-6.12/pidfs-improve-multi-threaded-exec-and-premature-thre.patch b/queue-6.12/pidfs-improve-multi-threaded-exec-and-premature-thre.patch index fe0daee09e..834b5c7720 100644 --- a/queue-6.12/pidfs-improve-multi-threaded-exec-and-premature-thre.patch +++ b/queue-6.12/pidfs-improve-multi-threaded-exec-and-premature-thre.patch @@ -57,16 +57,14 @@ Link: https://lore.kernel.org/r/20250320-work-pidfs-thread_group-v4-1-da678ce805 Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- - fs/pidfs.c | 9 +++++---- - kernel/exit.c | 6 +++--- - kernel/signal.c | 3 +-- + fs/pidfs.c | 9 +++++---- + kernel/exit.c | 6 +++--- + kernel/signal.c | 3 +-- 3 files changed, 9 insertions(+), 9 deletions(-) -diff --git a/fs/pidfs.c b/fs/pidfs.c -index 80675b6bf8845..52b7e4f767327 100644 --- a/fs/pidfs.c +++ b/fs/pidfs.c -@@ -95,20 +95,21 @@ static void pidfd_show_fdinfo(struct seq_file *m, struct file *f) +@@ -95,20 +95,21 @@ static void pidfd_show_fdinfo(struct seq static __poll_t pidfd_poll(struct file *file, struct poll_table_struct *pts) { struct pid *pid = pidfd_pid(file); @@ -92,11 +90,9 @@ index 80675b6bf8845..52b7e4f767327 100644 poll_flags = EPOLLIN | EPOLLRDNORM; return poll_flags; -diff --git a/kernel/exit.c b/kernel/exit.c -index 9d888f26bf784..c94d23ccd1520 100644 --- a/kernel/exit.c +++ b/kernel/exit.c -@@ -745,10 +745,10 @@ static void exit_notify(struct task_struct *tsk, int group_dead) +@@ -742,10 +742,10 @@ static void exit_notify(struct task_stru tsk->exit_state = EXIT_ZOMBIE; /* @@ -110,11 +106,9 @@ index 9d888f26bf784..c94d23ccd1520 100644 do_notify_pidfd(tsk); if (unlikely(tsk->ptrace)) { -diff --git a/kernel/signal.c b/kernel/signal.c -index 2ae45e6eb6bb8..468b589c39e69 100644 --- a/kernel/signal.c +++ b/kernel/signal.c -@@ -2063,8 +2063,7 @@ bool do_notify_parent(struct task_struct *tsk, int sig) +@@ -2063,8 +2063,7 @@ bool do_notify_parent(struct task_struct WARN_ON_ONCE(!tsk->ptrace && (tsk->group_leader != tsk || !thread_group_empty(tsk))); /* @@ -124,6 +118,3 @@ index 2ae45e6eb6bb8..468b589c39e69 100644 */ if (thread_group_empty(tsk)) do_notify_pidfd(tsk); --- -2.39.5 - diff --git a/queue-6.14/pidfs-improve-multi-threaded-exec-and-premature-thre.patch b/queue-6.14/pidfs-improve-multi-threaded-exec-and-premature-thre.patch index 933c96703e..b01513dd49 100644 --- a/queue-6.14/pidfs-improve-multi-threaded-exec-and-premature-thre.patch +++ b/queue-6.14/pidfs-improve-multi-threaded-exec-and-premature-thre.patch @@ -57,16 +57,14 @@ Link: https://lore.kernel.org/r/20250320-work-pidfs-thread_group-v4-1-da678ce805 Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- - fs/pidfs.c | 9 +++++---- - kernel/exit.c | 6 +++--- - kernel/signal.c | 3 +-- + fs/pidfs.c | 9 +++++---- + kernel/exit.c | 6 +++--- + kernel/signal.c | 3 +-- 3 files changed, 9 insertions(+), 9 deletions(-) -diff --git a/fs/pidfs.c b/fs/pidfs.c -index c0478b3c55d9f..9aa4c705776dd 100644 --- a/fs/pidfs.c +++ b/fs/pidfs.c -@@ -188,20 +188,21 @@ static void pidfd_show_fdinfo(struct seq_file *m, struct file *f) +@@ -188,20 +188,21 @@ static void pidfd_show_fdinfo(struct seq static __poll_t pidfd_poll(struct file *file, struct poll_table_struct *pts) { struct pid *pid = pidfd_pid(file); @@ -92,11 +90,9 @@ index c0478b3c55d9f..9aa4c705776dd 100644 poll_flags = EPOLLIN | EPOLLRDNORM; return poll_flags; -diff --git a/kernel/exit.c b/kernel/exit.c -index 6bb59b16e33e1..a9960dd6d0aa0 100644 --- a/kernel/exit.c +++ b/kernel/exit.c -@@ -744,10 +744,10 @@ static void exit_notify(struct task_struct *tsk, int group_dead) +@@ -741,10 +741,10 @@ static void exit_notify(struct task_stru tsk->exit_state = EXIT_ZOMBIE; /* @@ -110,11 +106,9 @@ index 6bb59b16e33e1..a9960dd6d0aa0 100644 do_notify_pidfd(tsk); if (unlikely(tsk->ptrace)) { -diff --git a/kernel/signal.c b/kernel/signal.c -index 875e97f6205a2..b2e5c90f29602 100644 --- a/kernel/signal.c +++ b/kernel/signal.c -@@ -2180,8 +2180,7 @@ bool do_notify_parent(struct task_struct *tsk, int sig) +@@ -2180,8 +2180,7 @@ bool do_notify_parent(struct task_struct WARN_ON_ONCE(!tsk->ptrace && (tsk->group_leader != tsk || !thread_group_empty(tsk))); /* @@ -124,6 +118,3 @@ index 875e97f6205a2..b2e5c90f29602 100644 */ if (thread_group_empty(tsk)) do_notify_pidfd(tsk); --- -2.39.5 -