mirror of
https://github.com/dynup/kpatch
synced 2025-02-16 17:57:02 +00:00
e4a2215987
Provides integration tests for rhel-9.3 (kernel-5.14.0-362.8.1.el9_3) Signed-off-by: Ryan Sullivan <rysulliv@redhat.com>
76 lines
2.4 KiB
Diff
76 lines
2.4 KiB
Diff
diff -Nupr src.orig/fs/proc/array.c src/fs/proc/array.c
|
|
--- src.orig/fs/proc/array.c 2023-07-14 10:41:06.283435190 -0400
|
|
+++ src/fs/proc/array.c 2023-07-14 10:41:29.489389549 -0400
|
|
@@ -402,12 +402,19 @@ static inline void task_seccomp(struct s
|
|
seq_putc(m, '\n');
|
|
}
|
|
|
|
+#include <linux/livepatch.h>
|
|
static inline void task_context_switch_counts(struct seq_file *m,
|
|
struct task_struct *p)
|
|
{
|
|
+ int *newpid;
|
|
+
|
|
seq_put_decimal_ull(m, "voluntary_ctxt_switches:\t", p->nvcsw);
|
|
seq_put_decimal_ull(m, "\nnonvoluntary_ctxt_switches:\t", p->nivcsw);
|
|
seq_putc(m, '\n');
|
|
+
|
|
+ newpid = klp_shadow_get(p, 0);
|
|
+ if (newpid)
|
|
+ seq_printf(m, "newpid:\t%d\n", *newpid);
|
|
}
|
|
|
|
static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
|
|
diff -Nupr src.orig/kernel/exit.c src/kernel/exit.c
|
|
--- src.orig/kernel/exit.c 2023-07-14 10:41:06.560434645 -0400
|
|
+++ src/kernel/exit.c 2023-07-14 10:41:29.490389546 -0400
|
|
@@ -732,6 +732,7 @@ static void check_stack_usage(void)
|
|
static inline void check_stack_usage(void) {}
|
|
#endif
|
|
|
|
+#include <linux/livepatch.h>
|
|
void __noreturn do_exit(long code)
|
|
{
|
|
struct task_struct *tsk = current;
|
|
@@ -794,6 +795,8 @@ void __noreturn do_exit(long code)
|
|
exit_task_work(tsk);
|
|
exit_thread(tsk);
|
|
|
|
+ klp_shadow_free(tsk, 0, NULL);
|
|
+
|
|
/*
|
|
* Flush inherited counters to the parent - before the parent
|
|
* gets woken up by child-exit notifications.
|
|
diff -Nupr src.orig/kernel/fork.c src/kernel/fork.c
|
|
--- src.orig/kernel/fork.c 2023-07-14 10:41:06.560434645 -0400
|
|
+++ src/kernel/fork.c 2023-07-14 10:41:29.491389545 -0400
|
|
@@ -2601,6 +2601,7 @@ struct task_struct *create_io_thread(int
|
|
*
|
|
* args->exit_signal is expected to be checked for sanity by the caller.
|
|
*/
|
|
+#include <linux/livepatch.h>
|
|
pid_t kernel_clone(struct kernel_clone_args *args)
|
|
{
|
|
u64 clone_flags = args->flags;
|
|
@@ -2609,6 +2610,8 @@ pid_t kernel_clone(struct kernel_clone_a
|
|
struct task_struct *p;
|
|
int trace = 0;
|
|
pid_t nr;
|
|
+ int *newpid;
|
|
+ static int ctr = 0;
|
|
|
|
/*
|
|
* For legacy clone() calls, CLONE_PIDFD uses the parent_tid argument
|
|
@@ -2648,6 +2651,11 @@ pid_t kernel_clone(struct kernel_clone_a
|
|
if (IS_ERR(p))
|
|
return PTR_ERR(p);
|
|
|
|
+ newpid = klp_shadow_get_or_alloc(p, 0, sizeof(*newpid), GFP_KERNEL,
|
|
+ NULL, NULL);
|
|
+ if (newpid)
|
|
+ *newpid = ctr++;
|
|
+
|
|
/*
|
|
* Do this prior waking up the new thread - the thread pointer
|
|
* might get invalid after that point, if the thread exits quickly.
|