From 4e69b4be811569655df75f9d0511dc2a139a1667 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Tue, 8 Sep 2020 19:11:23 +0200 Subject: kernel 5.8.6 --- ...f-xgene_pmu-Fix-uninitialized-resource-st.patch | 109 +++++++++++++++++++++ ...oundary-test-in-xfs_attr_shortform_verify.patch | 49 +++++++++ SOURCES/kernel-aarch64-fedora.config | 2 +- SOURCES/kernel-armv7hl-debug-fedora.config | 2 +- SOURCES/kernel-armv7hl-fedora.config | 2 +- SOURCES/kernel-armv7hl-lpae-debug-fedora.config | 2 +- SOURCES/kernel-armv7hl-lpae-fedora.config | 2 +- SOURCES/kernel-i686-debug-fedora.config | 2 +- SOURCES/kernel-i686-fedora.config | 2 +- SOURCES/kernel-ppc64le-debug-fedora.config | 2 +- SOURCES/kernel-ppc64le-fedora.config | 2 +- SOURCES/kernel-s390x-debug-fedora.config | 2 +- SOURCES/kernel-s390x-fedora.config | 2 +- SOURCES/kernel-x86_64-debug-fedora.config | 2 +- SOURCES/kernel-x86_64-fedora.config | 2 +- SPECS/kernel.spec | 26 +++-- 16 files changed, 188 insertions(+), 22 deletions(-) create mode 100644 SOURCES/0001-drivers-perf-xgene_pmu-Fix-uninitialized-resource-st.patch create mode 100644 SOURCES/0001-xfs-fix-boundary-test-in-xfs_attr_shortform_verify.patch diff --git a/SOURCES/0001-drivers-perf-xgene_pmu-Fix-uninitialized-resource-st.patch b/SOURCES/0001-drivers-perf-xgene_pmu-Fix-uninitialized-resource-st.patch new file mode 100644 index 0000000..ddd1bb2 --- /dev/null +++ b/SOURCES/0001-drivers-perf-xgene_pmu-Fix-uninitialized-resource-st.patch @@ -0,0 +1,109 @@ +From 68912566d659046b12b02e5a316af3760e08eab8 Mon Sep 17 00:00:00 2001 +From: Fedora Kernel Team +Date: Tue, 1 Sep 2020 18:44:00 -0400 +Subject: [PATCH] drivers/perf: xgene_pmu: Fix uninitialized resource struct + +This splat was reported on newer Fedora kernels booting on certain +Ampere machines: + + xgene-pmu APMC0D83:00: X-Gene PMU version 3 + Unable to handle kernel read from unreadable memory at virtual address 0000000000004006 + Mem abort info: + ESR = 0x96000004 + EC = 0x25: DABT (current EL), IL = 32 bits + SET = 0, FnV = 0 + EA = 0, S1PTW = 0 + Data abort info: + ISV = 0, ISS = 0x00000004 + CM = 0, WnR = 0 + [0000000000004006] user address but active_mm is swapper + Internal error: Oops: 96000004 [#1] SMP + Modules linked in: + CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.8.3-300.fc33.aarch64 #1 + Hardware name: Lenovo HR350A 7X35CTO1WW /HR350A , BIOS HVE104N-1.12 11/29/2019 + pstate: 00400005 (nzcv daif +PAN -UAO BTYPE=--) + pc : string+0x50/0x100 + lr : vsnprintf+0x160/0x750 + sp : ffff800012b4b760 + x29: ffff800012b4b760 x28: 000000000000000c + x27: ffff8000113610d5 x26: ffff8000113610d5 + x25: 0000000000000020 x24: 0000000000000000 + x23: 00000000ffffffe8 x22: ffff800010f8e628 + x21: ffff800012b4b8f0 x20: 0000000000000000 + x19: 0000000000000000 x18: 00000000fffffffc + x17: 000000000000002d x16: 0000000000000001 + x15: 0000000000000020 x14: 0000000000000000 + x13: 0000000000000000 x12: 071c71c71c71c71c + x11: 00000000ffffff76 x10: ffff800012b4b8f0 + x9 : ffff8000109e97d8 x8 : 00000000ffffffff + x7 : 000000000000000b x6 : 0000000000000000 + x5 : 0000000000000000 x4 : 0000000000000000 + x3 : ffff0a00ffffff04 x2 : 0000000000004006 + x1 : ffffffffffffffff x0 : 000000000000000c + Call trace: + string+0x50/0x100 + vsnprintf+0x160/0x750 + devm_kvasprintf+0x5c/0xb4 + devm_kasprintf+0x54/0x60 + __devm_ioremap_resource+0xdc/0x1a0 + devm_ioremap_resource+0x14/0x20 + acpi_get_pmu_hw_inf.isra.0+0x84/0x15c + acpi_pmu_dev_add+0xbc/0x21c + acpi_ns_walk_namespace+0x16c/0x1e4 + acpi_walk_namespace+0xb4/0xfc + xgene_pmu_probe_pmu_dev+0x7c/0xe0 + xgene_pmu_probe.part.0+0x2c0/0x310 + xgene_pmu_probe+0x54/0x64 + platform_drv_probe+0x60/0xb4 + really_probe+0xe8/0x4a0 + driver_probe_device+0xe4/0x100 + device_driver_attach+0xcc/0xd4 + __driver_attach+0xb0/0x17c + bus_for_each_dev+0x6c/0xb0 + driver_attach+0x30/0x40 + bus_add_driver+0x154/0x250 + driver_register+0x84/0x140 + __platform_driver_register+0x54/0x60 + xgene_pmu_driver_init+0x28/0x34 + do_one_initcall+0x40/0x204 + do_initcalls+0x104/0x144 + kernel_init_freeable+0x198/0x210 + kernel_init+0x20/0x12c + ret_from_fork+0x10/0x18 + Code: 91000400 110004e1 eb08009f 540000c0 (38646846) + ---[ end trace f08c10566496a703 ]--- + Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b + SMP: stopping secondary CPUs + Kernel Offset: 0x40000 from 0xffff800010000000 + PHYS_OFFSET: 0x80000000 + CPU features: 0x240002,20802008 + Memory Limit: none + +This was due to a local struct resource variable in acpi_get_pmu_hw_inf(). +A pointer to that struct makes it's way to __devm_ioremap_resource() +where the name field is passed to devm_kasprintf() and dereferenced. +The struct was never initialized, so the name pointer is whatever +happened to be on the stack. This has been the case since the original +checkin of xgene_pmu.c, but it was a recent change to which added the +use of the name field. + +Signed-off-by: Mark Salter +--- + drivers/perf/xgene_pmu.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/perf/xgene_pmu.c b/drivers/perf/xgene_pmu.c +index edac28c..fdbbd08 100644 +--- a/drivers/perf/xgene_pmu.c ++++ b/drivers/perf/xgene_pmu.c +@@ -1483,6 +1483,7 @@ xgene_pmu_dev_ctx *acpi_get_pmu_hw_inf(struct xgene_pmu *xgene_pmu, + return NULL; + + INIT_LIST_HEAD(&resource_list); ++ memset(&res, 0, sizeof(res)); + rc = acpi_dev_get_resources(adev, &resource_list, + acpi_pmu_dev_add_resource, &res); + acpi_dev_free_resource_list(&resource_list); +-- +2.26.0 + diff --git a/SOURCES/0001-xfs-fix-boundary-test-in-xfs_attr_shortform_verify.patch b/SOURCES/0001-xfs-fix-boundary-test-in-xfs_attr_shortform_verify.patch new file mode 100644 index 0000000..771f439 --- /dev/null +++ b/SOURCES/0001-xfs-fix-boundary-test-in-xfs_attr_shortform_verify.patch @@ -0,0 +1,49 @@ +From f4020438fab05364018c91f7e02ebdd192085933 Mon Sep 17 00:00:00 2001 +From: Eric Sandeen +Date: Wed, 26 Aug 2020 14:11:58 -0700 +Subject: [PATCH] xfs: fix boundary test in xfs_attr_shortform_verify + +The boundary test for the fixed-offset parts of xfs_attr_sf_entry in +xfs_attr_shortform_verify is off by one, because the variable array +at the end is defined as nameval[1] not nameval[]. +Hence we need to subtract 1 from the calculation. + +This can be shown by: + +# touch file +# setfattr -n root.a file + +and verifications will fail when it's written to disk. + +This only matters for a last attribute which has a single-byte name +and no value, otherwise the combination of namelen & valuelen will +push endp further out and this test won't fail. + +Fixes: 1e1bbd8e7ee06 ("xfs: create structure verifier function for shortform xattrs") +Signed-off-by: Eric Sandeen +Reviewed-by: Darrick J. Wong +Signed-off-by: Darrick J. Wong +Reviewed-by: Christoph Hellwig +--- + fs/xfs/libxfs/xfs_attr_leaf.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c +index 8623c815164a..383b08f2ac61 100644 +--- a/fs/xfs/libxfs/xfs_attr_leaf.c ++++ b/fs/xfs/libxfs/xfs_attr_leaf.c +@@ -1036,8 +1036,10 @@ xfs_attr_shortform_verify( + * struct xfs_attr_sf_entry has a variable length. + * Check the fixed-offset parts of the structure are + * within the data buffer. ++ * xfs_attr_sf_entry is defined with a 1-byte variable ++ * array at the end, so we must subtract that off. + */ +- if (((char *)sfep + sizeof(*sfep)) >= endp) ++ if (((char *)sfep + sizeof(*sfep) - 1) >= endp) + return __this_address; + + /* Don't allow names with known bad length. */ +-- +2.26.2 + diff --git a/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config index 1d130bc..b58de88 100644 --- a/SOURCES/kernel-aarch64-fedora.config +++ b/SOURCES/kernel-aarch64-fedora.config @@ -7426,7 +7426,7 @@ CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set CONFIG_USB_XHCI_MVEBU=m -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m diff --git a/SOURCES/kernel-armv7hl-debug-fedora.config b/SOURCES/kernel-armv7hl-debug-fedora.config index e3cc566..0793c6a 100644 --- a/SOURCES/kernel-armv7hl-debug-fedora.config +++ b/SOURCES/kernel-armv7hl-debug-fedora.config @@ -7718,7 +7718,7 @@ CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set CONFIG_USB_XHCI_MVEBU=m -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m diff --git a/SOURCES/kernel-armv7hl-fedora.config b/SOURCES/kernel-armv7hl-fedora.config index 25b5466..48fe1a4 100644 --- a/SOURCES/kernel-armv7hl-fedora.config +++ b/SOURCES/kernel-armv7hl-fedora.config @@ -7698,7 +7698,7 @@ CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set CONFIG_USB_XHCI_MVEBU=m -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m diff --git a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config index a3df320..97a111e 100644 --- a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config @@ -7460,7 +7460,7 @@ CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set CONFIG_USB_XHCI_MVEBU=m -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m diff --git a/SOURCES/kernel-armv7hl-lpae-fedora.config b/SOURCES/kernel-armv7hl-lpae-fedora.config index 8696602..2dcfc25 100644 --- a/SOURCES/kernel-armv7hl-lpae-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-fedora.config @@ -7440,7 +7440,7 @@ CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set CONFIG_USB_XHCI_MVEBU=m -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m diff --git a/SOURCES/kernel-i686-debug-fedora.config b/SOURCES/kernel-i686-debug-fedora.config index d654346..e5b1d88 100644 --- a/SOURCES/kernel-i686-debug-fedora.config +++ b/SOURCES/kernel-i686-debug-fedora.config @@ -6726,7 +6726,7 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/SOURCES/kernel-i686-fedora.config b/SOURCES/kernel-i686-fedora.config index 7fd19cd..c0ad6c7 100644 --- a/SOURCES/kernel-i686-fedora.config +++ b/SOURCES/kernel-i686-fedora.config @@ -6705,7 +6705,7 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/SOURCES/kernel-ppc64le-debug-fedora.config b/SOURCES/kernel-ppc64le-debug-fedora.config index 3031761..eac58bf 100644 --- a/SOURCES/kernel-ppc64le-debug-fedora.config +++ b/SOURCES/kernel-ppc64le-debug-fedora.config @@ -6302,7 +6302,7 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/SOURCES/kernel-ppc64le-fedora.config b/SOURCES/kernel-ppc64le-fedora.config index 2f832fa..77bbac2 100644 --- a/SOURCES/kernel-ppc64le-fedora.config +++ b/SOURCES/kernel-ppc64le-fedora.config @@ -6280,7 +6280,7 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/SOURCES/kernel-s390x-debug-fedora.config b/SOURCES/kernel-s390x-debug-fedora.config index d9fa0b1..c8a10e7 100644 --- a/SOURCES/kernel-s390x-debug-fedora.config +++ b/SOURCES/kernel-s390x-debug-fedora.config @@ -6241,7 +6241,7 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/SOURCES/kernel-s390x-fedora.config b/SOURCES/kernel-s390x-fedora.config index ed281f6..6e9fd89 100644 --- a/SOURCES/kernel-s390x-fedora.config +++ b/SOURCES/kernel-s390x-fedora.config @@ -6219,7 +6219,7 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config index d5d75ac..ce64713 100644 --- a/SOURCES/kernel-x86_64-debug-fedora.config +++ b/SOURCES/kernel-x86_64-debug-fedora.config @@ -6780,7 +6780,7 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config index 32628a4..c31efe1 100644 --- a/SOURCES/kernel-x86_64-fedora.config +++ b/SOURCES/kernel-x86_64-fedora.config @@ -6759,7 +6759,7 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 20538b3..4cfc5bd 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 201 +%global baserelease 202 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -92,7 +92,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 4 +%define stable_update 6 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -861,14 +861,14 @@ Patch101: 0001-PCI-Add-MCFG-quirks-for-Tegra194-host-controllers.patch Patch102: 0002-arm64-tegra-Re-order-PCIe-aperture-mappings-to-suppo.patch Patch103: arm64-tegra-Use-valid-PWM-period-for-VDD_GPU-on-Tegra210.patch -# https://lkml.org/lkml/2020/8/14/221 -Patch104: dma-pool-fixes.patch - # Goes away with 5.9 Patch105: 0001-platform-x86-thinkpad_acpi-lap-or-desk-mode-interfac.patch -#Temporary build fix (will figure this out after Plumbers) -Patch106: 0001-revert-ARM64-vdso32-Install-vdso32-from-vdso_install.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1874117 +Patch107: 0001-drivers-perf-xgene_pmu-Fix-uninitialized-resource-st.patch + +# CVE-2020-14385 rhbz 1874800 1874811 +Patch108: 0001-xfs-fix-boundary-test-in-xfs_attr_shortform_verify.patch # Linux-tkg patches - https://github.com/Frogging-Family/linux-tkg/blob/master/linux57-tkg Patch200: 0007-v5.8-fsync.patch @@ -2977,8 +2977,16 @@ fi # # %changelog -* Mon Aug 31 2020 Jan Drögehoff - 5.8.4-201.fsync -- Linux v5.8.4 fsync +* Tue Sep 08 2020 Jan Drögehoff - 5.8.6-202.fsync +- Linux v5.8.6 fsync + +* Thu Sep 03 2020 Justin M. Forbes - 5.8.6-201 +- Linux v5.8.6 +- Fix CVE-2020-14385 (rhbz 1874800 1874811) +- Move CONFIG_USB_XHCI_PCI_RENESAS to inline (rhbz 1874300) + +* Thu Aug 27 2020 Justin M. Forbes - 5.8.5-200 +- Linux v5.8.5 * Wed Aug 26 2020 Justin M. Forbes - 5.8.4-200 - Linux v5.8.4 rebase -- cgit v1.2.3