summaryrefslogtreecommitdiffstats
path: root/patch-5.12-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-06-10 08:35:37 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-06-10 08:35:37 -0500
commit9e47a9f3e8f3e0057f7f5bcb8f963e94bc28f200 (patch)
tree57b19ad8415ab76683ce1e9526a1f09ea355725c /patch-5.12-redhat.patch
parent232bd7472643da245ebe5704f763ea7f96343cfc (diff)
downloadkernel-9e47a9f3e8f3e0057f7f5bcb8f963e94bc28f200.tar.gz
kernel-9e47a9f3e8f3e0057f7f5bcb8f963e94bc28f200.tar.xz
kernel-9e47a9f3e8f3e0057f7f5bcb8f963e94bc28f200.zip
kernel-5.12.10-0
* 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) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.12-redhat.patch')
-rw-r--r--patch-5.12-redhat.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patch-5.12-redhat.patch b/patch-5.12-redhat.patch
index a082bca72..af5ab8ea3 100644
--- a/patch-5.12-redhat.patch
+++ b/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);