test/integration/rhel-9.5: update tests to kernel-5.14.0-479.el9

Signed-off-by: Ryan Sullivan <[email protected]>
dynup · Jul 12, 2024 · 2cd087d · 2cd087d
1 parent f9d6d47
commit 2cd087d
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 35 deletions.
diff --git a/test/integration/rhel-9.5/data-new.patch b/test/integration/rhel-9.5/data-new.patch
@@ -1,7 +1,7 @@
 diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
---- src.orig/fs/proc/meminfo.c	2024-05-16 10:26:19.687215651 -0400
-+++ src/fs/proc/meminfo.c	2024-05-16 10:26:20.525216178 -0400
-@@ -29,6 +29,8 @@ static void show_val_kb(struct seq_file
+--- src.orig/fs/proc/meminfo.c	2024-07-12 13:29:00.219637700 -0400
++++ src/fs/proc/meminfo.c	2024-07-12 13:29:01.058638072 -0400
+@@ -30,6 +30,8 @@ static void show_val_kb(struct seq_file
  	seq_write(m, " kB\n", 4);
  }
 
@@ -10,7 +10,7 @@ diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
  static int meminfo_proc_show(struct seq_file *m, void *v)
  {
  	struct sysinfo i;
-@@ -154,6 +156,7 @@ static int meminfo_proc_show(struct seq_
+@@ -155,6 +157,7 @@ static int meminfo_proc_show(struct seq_
  	show_val_kb(m, "CmaFree:        ",
  		    global_zone_page_state(NR_FREE_CMA_PAGES));
  #endif

diff --git a/test/integration/rhel-9.5/gcc-static-local-var-6.patch b/test/integration/rhel-9.5/gcc-static-local-var-6.patch
@@ -1,6 +1,6 @@
 diff -Nupr src.orig/net/ipv6/netfilter.c src/net/ipv6/netfilter.c
---- src.orig/net/ipv6/netfilter.c	2024-05-16 10:26:19.971215830 -0400
-+++ src/net/ipv6/netfilter.c	2024-05-16 10:26:27.941220839 -0400
+--- src.orig/net/ipv6/netfilter.c	2024-07-12 13:29:00.495637823 -0400
++++ src/net/ipv6/netfilter.c	2024-07-12 13:29:08.342641303 -0400
 @@ -96,6 +96,8 @@ static int nf_ip6_reroute(struct sk_buff
  	return 0;
  }

diff --git a/test/integration/rhel-9.5/macro-callbacks.patch b/test/integration/rhel-9.5/macro-callbacks.patch
@@ -1,6 +1,6 @@
 diff -Nupr src.orig/drivers/input/joydev.c src/drivers/input/joydev.c
---- src.orig/drivers/input/joydev.c	2024-05-16 10:26:19.151215314 -0400
-+++ src/drivers/input/joydev.c	2024-05-16 10:26:30.300222322 -0400
+--- src.orig/drivers/input/joydev.c	2024-07-12 13:28:59.701637471 -0400
++++ src/drivers/input/joydev.c	2024-07-12 13:29:10.796642392 -0400
 @@ -1096,3 +1096,47 @@ static void __exit joydev_exit(void)
 
  module_init(joydev_init);
@@ -50,8 +50,8 @@ diff -Nupr src.orig/drivers/input/joydev.c src/drivers/input/joydev.c
 +}
 +KPATCH_POST_UNPATCH_CALLBACK(post_unpatch_callback);
 diff -Nupr src.orig/drivers/input/misc/pcspkr.c src/drivers/input/misc/pcspkr.c
---- src.orig/drivers/input/misc/pcspkr.c	2024-05-16 10:26:19.156215318 -0400
-+++ src/drivers/input/misc/pcspkr.c	2024-05-16 10:26:30.300222322 -0400
+--- src.orig/drivers/input/misc/pcspkr.c	2024-07-12 13:28:59.705637473 -0400
++++ src/drivers/input/misc/pcspkr.c	2024-07-12 13:29:10.796642392 -0400
 @@ -134,3 +134,46 @@ static struct platform_driver pcspkr_pla
  };
  module_platform_driver(pcspkr_platform_driver);
@@ -100,8 +100,8 @@ diff -Nupr src.orig/drivers/input/misc/pcspkr.c src/drivers/input/misc/pcspkr.c
 +}
 +KPATCH_POST_UNPATCH_CALLBACK(post_unpatch_callback);
 diff -Nupr src.orig/fs/aio.c src/fs/aio.c
---- src.orig/fs/aio.c	2024-05-16 10:26:19.655215631 -0400
-+++ src/fs/aio.c	2024-05-16 10:26:30.300222322 -0400
+--- src.orig/fs/aio.c	2024-07-12 13:29:00.188637687 -0400
++++ src/fs/aio.c	2024-07-12 13:29:10.797642392 -0400
 @@ -50,6 +50,50 @@
 
  #define KIOCB_KEY		0

diff --git a/test/integration/rhel-9.5/module.patch b/test/integration/rhel-9.5/module.patch
@@ -1,6 +1,6 @@
 diff -Nupr src.orig/fs/nfsd/export.c src/fs/nfsd/export.c
---- src.orig/fs/nfsd/export.c	2024-05-16 10:26:19.678215646 -0400
-+++ src/fs/nfsd/export.c	2024-05-16 10:26:32.672223813 -0400
+--- src.orig/fs/nfsd/export.c	2024-07-12 13:29:00.210637697 -0400
++++ src/fs/nfsd/export.c	2024-07-12 13:29:13.265643487 -0400
 @@ -1342,6 +1342,10 @@ static void exp_flags(struct seq_file *m
  	}
  }
@@ -50,9 +50,9 @@ diff -Nupr src.orig/fs/nfsd/export.c src/fs/nfsd/export.c
  	}
 
 diff -Nupr src.orig/net/netlink/af_netlink.c src/net/netlink/af_netlink.c
---- src.orig/net/netlink/af_netlink.c	2024-05-16 10:26:19.984215838 -0400
-+++ src/net/netlink/af_netlink.c	2024-05-16 10:26:32.673223814 -0400
-@@ -2940,4 +2940,9 @@ panic:
+--- src.orig/net/netlink/af_netlink.c	2024-07-12 13:29:00.508637828 -0400
++++ src/net/netlink/af_netlink.c	2024-07-12 13:29:13.266643487 -0400
+@@ -2936,4 +2936,9 @@ panic:
  	panic("netlink_init: Cannot allocate nl_table\n");
  }
 

diff --git a/test/integration/rhel-9.5/new-globals.patch b/test/integration/rhel-9.5/new-globals.patch
@@ -1,6 +1,6 @@
 diff -Nupr src.orig/fs/proc/cmdline.c src/fs/proc/cmdline.c
---- src.orig/fs/proc/cmdline.c	2024-05-16 10:26:19.687215651 -0400
-+++ src/fs/proc/cmdline.c	2024-05-16 10:26:35.083225328 -0400
+--- src.orig/fs/proc/cmdline.c	2024-07-12 13:29:00.219637700 -0400
++++ src/fs/proc/cmdline.c	2024-07-12 13:29:15.688644562 -0400
 @@ -17,3 +17,10 @@ static int __init proc_cmdline_init(void
  	return 0;
  }
@@ -13,9 +13,9 @@ diff -Nupr src.orig/fs/proc/cmdline.c src/fs/proc/cmdline.c
 +		printk("hello there!\n");
 +}
 diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
---- src.orig/fs/proc/meminfo.c	2024-05-16 10:26:19.687215651 -0400
-+++ src/fs/proc/meminfo.c	2024-05-16 10:26:35.083225328 -0400
-@@ -19,6 +19,8 @@
+--- src.orig/fs/proc/meminfo.c	2024-07-12 13:29:00.219637700 -0400
++++ src/fs/proc/meminfo.c	2024-07-12 13:29:15.688644562 -0400
+@@ -20,6 +20,8 @@
  #include <asm/page.h>
  #include "internal.h"
 
@@ -24,7 +24,7 @@ diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
  void __attribute__((weak)) arch_report_meminfo(struct seq_file *m)
  {
  }
-@@ -55,6 +57,7 @@ static int meminfo_proc_show(struct seq_
+@@ -56,6 +58,7 @@ static int meminfo_proc_show(struct seq_
  	sreclaimable = global_node_page_state_pages(NR_SLAB_RECLAIMABLE_B);
  	sunreclaim = global_node_page_state_pages(NR_SLAB_UNRECLAIMABLE_B);
 

diff --git a/test/integration/rhel-9.5/shadow-newpid.patch b/test/integration/rhel-9.5/shadow-newpid.patch
@@ -1,6 +1,6 @@
 diff -Nupr src.orig/fs/proc/array.c src/fs/proc/array.c
---- src.orig/fs/proc/array.c	2024-05-16 10:26:19.687215651 -0400
-+++ src/fs/proc/array.c	2024-05-16 10:26:37.491226842 -0400
+--- src.orig/fs/proc/array.c	2024-07-12 13:29:00.219637700 -0400
++++ src/fs/proc/array.c	2024-07-12 13:29:18.105645633 -0400
 @@ -403,12 +403,19 @@ static inline void task_seccomp(struct s
  	seq_putc(m, '\n');
  }
@@ -22,8 +22,8 @@ diff -Nupr src.orig/fs/proc/array.c src/fs/proc/array.c
 
  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	2024-05-16 10:26:19.925215801 -0400
-+++ src/kernel/exit.c	2024-05-16 10:26:37.491226842 -0400
+--- src.orig/kernel/exit.c	2024-07-12 13:29:00.448637802 -0400
++++ src/kernel/exit.c	2024-07-12 13:29:18.106645634 -0400
 @@ -765,6 +765,7 @@ static void check_stack_usage(void)
  static inline void check_stack_usage(void) {}
  #endif
@@ -42,8 +42,8 @@ diff -Nupr src.orig/kernel/exit.c src/kernel/exit.c
  	 * 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	2024-05-16 10:26:19.925215801 -0400
-+++ src/kernel/fork.c	2024-05-16 10:26:37.492226843 -0400
+--- src.orig/kernel/fork.c	2024-07-12 13:29:00.448637802 -0400
++++ src/kernel/fork.c	2024-07-12 13:29:18.106645634 -0400
 @@ -2714,6 +2714,7 @@ struct task_struct *create_io_thread(int
   *
   * args->exit_signal is expected to be checked for sanity by the caller.

diff --git a/test/integration/rhel-9.5/special-static.patch b/test/integration/rhel-9.5/special-static.patch
@@ -1,6 +1,6 @@
 diff -Nupr src.orig/kernel/fork.c src/kernel/fork.c
---- src.orig/kernel/fork.c	2024-05-16 10:26:19.925215801 -0400
-+++ src/kernel/fork.c	2024-05-16 10:26:39.930228375 -0400
+--- src.orig/kernel/fork.c	2024-07-12 13:29:00.448637802 -0400
++++ src/kernel/fork.c	2024-07-12 13:29:20.559646722 -0400
 @@ -1783,10 +1783,18 @@ static void posix_cpu_timers_init_group(
  	posix_cputimers_group_init(pct, cpu_limit);
  }

diff --git a/test/integration/rhel-9.5/syscall.patch b/test/integration/rhel-9.5/syscall.patch
@@ -1,6 +1,6 @@
 diff -Nupr src.orig/kernel/sys.c src/kernel/sys.c
---- src.orig/kernel/sys.c	2024-05-16 10:26:19.931215805 -0400
-+++ src/kernel/sys.c	2024-05-16 10:26:42.352229898 -0400
+--- src.orig/kernel/sys.c	2024-07-12 13:29:00.454637804 -0400
++++ src/kernel/sys.c	2024-07-12 13:29:22.972647792 -0400
 @@ -1285,13 +1285,15 @@ static int override_release(char __user
  	return ret;
  }

diff --git a/test/integration/rhel-9.5/warn-detect-FAIL.patch b/test/integration/rhel-9.5/warn-detect-FAIL.patch
@@ -1,6 +1,6 @@
 diff -Nupr src.orig/arch/x86/kvm/x86.c src/arch/x86/kvm/x86.c
---- src.orig/arch/x86/kvm/x86.c	2024-05-16 10:26:18.803215095 -0400
-+++ src/arch/x86/kvm/x86.c	2024-05-16 10:26:44.811231443 -0400
+--- src.orig/arch/x86/kvm/x86.c	2024-07-12 13:28:59.344637312 -0400
++++ src/arch/x86/kvm/x86.c	2024-07-12 13:29:25.411648874 -0400
 @@ -1,4 +1,5 @@
  // SPDX-License-Identifier: GPL-2.0-only
 +