diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-16 12:13:50 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-16 12:13:50 +0200 |
| commit | c90ed434ca0dd61508c8924c1e1fae407692e05e (patch) | |
| tree | dcba9ee90701473055380091e346322560239feb | |
| parent | ce42992ad2a7ac84e0952a142ebbefdd1a729c2d (diff) | |
| parent | 9e47a9f3e8f3e0057f7f5bcb8f963e94bc28f200 (diff) | |
| download | kernel-c90ed434ca0dd61508c8924c1e1fae407692e05e.tar.gz kernel-c90ed434ca0dd61508c8924c1e1fae407692e05e.tar.xz kernel-c90ed434ca0dd61508c8924c1e1fae407692e05e.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
| -rw-r--r-- | Patchlist.changelog | 6 | ||||
| -rwxr-xr-x | kernel.spec | 4 | ||||
| -rw-r--r-- | patch-5.12-redhat.patch | 8 | ||||
| -rw-r--r-- | sources | 6 |
4 files changed, 17 insertions, 7 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog index c27ff643c..cdab61233 100644 --- a/Patchlist.changelog +++ b/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/kernel.spec b/kernel.spec index 0fd34f773..5a4663aa9 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2797,6 +2797,10 @@ fi # # %changelog +* 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) 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); @@ -1,3 +1,3 @@ -SHA512 (linux-5.12.9.tar.xz) = 1c5e212aa17115c60cc73cd2f5736cfddd5f8d70f4196e261e3bf8ec30deeb22a0b8d6c22148333b14f74b81ee29307e7ed5a090d78abf8492e7bcf62bd75327 -SHA512 (kernel-abi-whitelists-5.12.9-300.tar.bz2) = 78a7f8b2007c22e986d699fabe87cbce9655f63e8cb189963eec943b309133a9005115b195018dcb4815ffeae5aef3ae20f20659493e47960168e47a288ff7f6 -SHA512 (kernel-kabi-dw-5.12.9-300.tar.bz2) = 0bddc7298acd32944bdb20fbef0015b4c5559b8054779ec8d04b2fdf3747e1975755e4716dc2536f1de931aa1d4e05447d4a15ec20c3db58500af8aaaeeece65 +SHA512 (linux-5.12.10.tar.xz) = d5bd7acad98d6c2872b5ed38cd976bd8dcb69613eb3aafb50c3a94f382918772a5506aa4e67bd698d0a1fd464e544409dda6c126a530652a082337cd7959f8d7 +SHA512 (kernel-abi-whitelists-5.12.10-300.tar.bz2) = ceeb600cf28a5cab719be05e4c41a75a655bbc67abbfe42a3e1d0f485f2a64603dc1a94f7df53e184311fd7a5100e6fb12ae9b5815ff3771ec946adb8050584e +SHA512 (kernel-kabi-dw-5.12.10-300.tar.bz2) = 3177f38d555e65042bf7c4db4c55913beeef1793c21bdf204f26f486d1c5a2603eb2c091179c42f7657b54a9a3944e9410030c13be0b7e1feb16271fca3ea0d4 |