kernel 5.12.10

3 files changed, 20 insertions, 10 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);
 
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 9c3a491..8194fd1 100755
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -106,7 +106,7 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-%define rpmversion 5.12.9
+%define rpmversion 5.12.10
 %define stableversion 5.12
 %define pkgrelease 301
 
@@ -623,7 +623,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.12.9.tar.xz
+Source0: linux-5.12.10.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1282,8 +1282,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.12.9 -c
-mv linux-5.12.9 linux-%{KVERREL}
+%setup -q -n kernel-5.12.10 -c
+mv linux-5.12.10 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2802,8 +2802,12 @@ fi
 #
 #
 %changelog
-* Fri Jun 04 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.12.9-301.fsync
-- Linux v5.12.8 futex2 zen openrgb
+* Fri Jun 11 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.12.10-300
+- Linux v5.12.10 futex2 zen openrgb
+
+* Thu Jun 10 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.10-0]
+- Bluetooth: use correct lock to prevent UAF of hdev object (Lin Ma)
+- nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect (Krzysztof Kozlowski)
 
 * Thu Jun 03 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.9-0]
 - selinux: Allow context mounts for unpriviliged overlayfs (Vivek Goyal)