diff options
author | Jan200101 <sentrycraft123@gmail.com> | 2021-06-11 20:03:24 +0200 |
---|---|---|
committer | Jan200101 <sentrycraft123@gmail.com> | 2021-06-11 20:03:24 +0200 |
commit | 8c905a301e6f5c450a972838233697ac398065b8 (patch) | |
tree | 047d6f51d81f06f6b9ee029922037b3e757a7575 /SOURCES | |
parent | 903b33b6e65e8bca72e765e131b7fe3cb4ae50c6 (diff) | |
download | kernel-fsync-8c905a301e6f5c450a972838233697ac398065b8.tar.gz kernel-fsync-8c905a301e6f5c450a972838233697ac398065b8.zip |
kernel 5.12.10
Diffstat (limited to 'SOURCES')
-rw-r--r-- | SOURCES/Patchlist.changelog | 6 | ||||
-rw-r--r-- | SOURCES/patch-5.12-redhat.patch | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog index c27ff64..cdab612 100644 --- a/SOURCES/Patchlist.changelog +++ b/SOURCES/Patchlist.changelog @@ -1,3 +1,9 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/b2d7ee79e7db6c474f9aa4ff14f53d860f6df8c1 + b2d7ee79e7db6c474f9aa4ff14f53d860f6df8c1 Bluetooth: use correct lock to prevent UAF of hdev object + +https://gitlab.com/cki-project/kernel-ark/-/commit/2ec22f15d6bc74158a277bcb60758a6de73e696f + 2ec22f15d6bc74158a277bcb60758a6de73e696f nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect + https://gitlab.com/cki-project/kernel-ark/-/commit/26fb1eba374faf7704bab5126612ae87b9f9f9fa 26fb1eba374faf7704bab5126612ae87b9f9f9fa selinux: Allow context mounts for unpriviliged overlayfs diff --git a/SOURCES/patch-5.12-redhat.patch b/SOURCES/patch-5.12-redhat.patch index a082bca..af5ab8e 100644 --- a/SOURCES/patch-5.12-redhat.patch +++ b/SOURCES/patch-5.12-redhat.patch @@ -65,7 +65,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index d53577db1085..a34665269a9a 100644 +index ebc02c56db03..13bbf56b1bd3 100644 --- a/Makefile +++ b/Makefile @@ -495,6 +495,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -165,7 +165,7 @@ index 5aab59ad5688..c53572b81c37 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index ccab6cf91283..dafae5a186d3 100644 +index e79f21d13a0d..7f0b86161e13 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -18,6 +18,7 @@ @@ -176,7 +176,7 @@ index ccab6cf91283..dafae5a186d3 100644 #include <linux/usb/xhci-dbgp.h> #include <linux/static_call.h> #include <linux/swiotlb.h> -@@ -954,6 +955,13 @@ void __init setup_arch(char **cmdline_p) +@@ -955,6 +956,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -190,7 +190,7 @@ index ccab6cf91283..dafae5a186d3 100644 dmi_setup(); /* -@@ -1112,19 +1120,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1113,19 +1121,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); |