July 2020 - Linux-stable-mirror

[tip: irq/urgent] genirq/affinity: Handle affinity setting on inactive interrupts correctly

by tip-bot2 for Thomas Gleixner

The following commit has been merged into the irq/urgent branch of tip: Commit-ID: baedb87d1b53532f81b4bd0387f83b05d4f7eb9a Gitweb: https://git.kernel.org/tip/baedb87d1b53532f81b4bd0387f83b05d4f7eb9a Author: Thomas Gleixner <tglx(a)linutronix.de> AuthorDate: Fri, 17 Jul 2020 18:00:02 +02:00 Committer: Thomas Gleixner <tglx(a)linutronix.de> CommitterDate: Fri, 17 Jul 2020 23:30:43 +02:00 genirq/affinity: Handle affinity setting on inactive interrupts correctly Setting interrupt affinity on inactive interrupts is inconsistent when hierarchical irq domains are enabled. The core code should just store the affinity and not call into the irq chip driver for inactive interrupts because the chip drivers may not be in a state to handle such requests. X86 has a hacky workaround for that but all other irq chips have not which causes problems e.g. on GIC V3 ITS. Instead of adding more ugly hacks all over the place, solve the problem in the core code. If the affinity is set on an inactive interrupt then: - Store it in the irq descriptors affinity mask - Update the effective affinity to reflect that so user space has a consistent view - Don't call into the irq chip driver This is the core equivalent of the X86 workaround and works correctly because the affinity setting is established in the irq chip when the interrupt is activated later on. Note, that this is only effective when hierarchical irq domains are enabled by the architecture. Doing it unconditionally would break legacy irq chip implementations. For hierarchial irq domains this works correctly as none of the drivers can have a dependency on affinity setting in inactive state by design. Remove the X86 workaround as it is not longer required. Fixes: 02edee152d6e ("x86/apic/vector: Ignore set_affinity call for inactive interrupts") Reported-by: Ali Saidi <alisaidi(a)amazon.com> Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Tested-by: Ali Saidi <alisaidi(a)amazon.com> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20200529015501.15771-1-alisaidi@amazon.com Link: https://lkml.kernel.org/r/877dv2rv25.fsf@nanos.tec.linutronix.de --- arch/x86/kernel/apic/vector.c | 22 ++++---------------- kernel/irq/manage.c | 37 ++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c index cc8b16f..7649da2 100644 --- a/arch/x86/kernel/apic/vector.c +++ b/arch/x86/kernel/apic/vector.c @@ -446,12 +446,10 @@ static int x86_vector_activate(struct irq_domain *dom, struct irq_data *irqd, trace_vector_activate(irqd->irq, apicd->is_managed, apicd->can_reserve, reserve); - /* Nothing to do for fixed assigned vectors */ - if (!apicd->can_reserve && !apicd->is_managed) - return 0; - raw_spin_lock_irqsave(&vector_lock, flags); - if (reserve || irqd_is_managed_and_shutdown(irqd)) + if (!apicd->can_reserve && !apicd->is_managed) + assign_irq_vector_any_locked(irqd); + else if (reserve || irqd_is_managed_and_shutdown(irqd)) vector_assign_managed_shutdown(irqd); else if (apicd->is_managed) ret = activate_managed(irqd); @@ -774,20 +772,10 @@ void lapic_offline(void) static int apic_set_affinity(struct irq_data *irqd, const struct cpumask *dest, bool force) { - struct apic_chip_data *apicd = apic_chip_data(irqd); int err; - /* - * Core code can call here for inactive interrupts. For inactive - * interrupts which use managed or reservation mode there is no - * point in going through the vector assignment right now as the - * activation will assign a vector which fits the destination - * cpumask. Let the core code store the destination mask and be - * done with it. - */ - if (!irqd_is_activated(irqd) && - (apicd->is_managed || apicd->can_reserve)) - return IRQ_SET_MASK_OK; + if (WARN_ON_ONCE(!irqd_is_activated(irqd))) + return -EIO; raw_spin_lock(&vector_lock); cpumask_and(vector_searchmask, dest, cpu_online_mask); diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 7619111..2a9fec5 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -195,9 +195,9 @@ void irq_set_thread_affinity(struct irq_desc *desc) set_bit(IRQTF_AFFINITY, &action->thread_flags); } +#ifdef CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK static void irq_validate_effective_affinity(struct irq_data *data) { -#ifdef CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK const struct cpumask *m = irq_data_get_effective_affinity_mask(data); struct irq_chip *chip = irq_data_get_irq_chip(data); @@ -205,9 +205,19 @@ static void irq_validate_effective_affinity(struct irq_data *data) return; pr_warn_once("irq_chip %s did not update eff. affinity mask of irq %u\n", chip->name, data->irq); -#endif } +static inline void irq_init_effective_affinity(struct irq_data *data, + const struct cpumask *mask) +{ + cpumask_copy(irq_data_get_effective_affinity_mask(data), mask); +} +#else +static inline void irq_validate_effective_affinity(struct irq_data *data) { } +static inline void irq_init_effective_affinity(struct irq_data *data, + const struct cpumask *mask) { } +#endif + int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force) { @@ -304,6 +314,26 @@ static int irq_try_set_affinity(struct irq_data *data, return ret; } +static bool irq_set_affinity_deactivated(struct irq_data *data, + const struct cpumask *mask, bool force) +{ + struct irq_desc *desc = irq_data_to_desc(data); + + /* + * If the interrupt is not yet activated, just store the affinity + * mask and do not call the chip driver at all. On activation the + * driver has to make sure anyway that the interrupt is in a + * useable state so startup works. + */ + if (!IS_ENABLED(CONFIG_IRQ_DOMAIN_HIERARCHY) || irqd_is_activated(data)) + return false; + + cpumask_copy(desc->irq_common_data.affinity, mask); + irq_init_effective_affinity(data, mask); + irqd_set(data, IRQD_AFFINITY_SET); + return true; +} + int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask, bool force) { @@ -314,6 +344,9 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask, if (!chip || !chip->irq_set_affinity) return -EINVAL; + if (irq_set_affinity_deactivated(data, mask, force)) + return 0; + if (irq_can_move_pcntxt(data) && !irqd_is_setaffinity_pending(data)) { ret = irq_try_set_affinity(data, mask, force); } else {

4 years, 5 months

1
0
0 0

[PATCH 01/12] timer: Fix wheel index calculation on last level

by Frederic Weisbecker

When an expiration delta falls into the last level of the wheel, we want to compare that delta against the maximum possible delay and reduce our delta to fit in if necessary. However instead of comparing the delta against the maximum, we are comparing the actual expiry against the maximum. Then instead of fixing the delta to fit in, we set the maximum delta as the expiry value. This can result in various undesired outcomes, the worst possible one being a timer expiring 15 days ahead to fire immediately. Fixes: 500462a9de65 ("timers: Switch to a non-cascading wheel") Signed-off-by: Frederic Weisbecker <frederic(a)kernel.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Anna-Maria Behnsen <anna-maria(a)linutronix.de> Cc: Juri Lelli <juri.lelli(a)redhat.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: stable(a)vger.kernel.org --- kernel/time/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 9a838d38dbe6..df1ff803acc4 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -521,8 +521,8 @@ static int calc_wheel_index(unsigned long expires, unsigned long clk) * Force expire obscene large timeouts to expire at the * capacity limit of the wheel. */ - if (expires >= WHEEL_TIMEOUT_CUTOFF) - expires = WHEEL_TIMEOUT_MAX; + if (delta >= WHEEL_TIMEOUT_CUTOFF) + expires = clk + WHEEL_TIMEOUT_MAX; idx = calc_index(expires, LVL_DEPTH - 1); } -- 2.26.2

4 years, 5 months

2
1
0 0

stable-rc/linux-5.4.y baseline: 104 runs, 2 regressions (v5.4.52-30-ge4f3e790ad57)

by kernelci.org bot

stable-rc/linux-5.4.y baseline: 104 runs, 2 regressions (v5.4.52-30-ge4f3e790ad57) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | results -----------------------------+-------+--------------+----------+-----------------+-------- at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 0/1 meson-gxl-s805x-libretech-ac | arm64 | lab-baylibre | gcc-8 | defconfig | 4/5 Details: https://kernelci.org/test/job/stable-rc/branch/linux-5.4.y/kernel/v5.4.52-3… Test: baseline Tree: stable-rc Branch: linux-5.4.y Describe: v5.4.52-30-ge4f3e790ad57 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: e4f3e790ad574b9b5bf762904e549b8d78190aa1 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | results -----------------------------+-------+--------------+----------+-----------------+-------- at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 0/1 Details: https://kernelci.org/test/plan/id/5f11c73b8b65ca755185bb25 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: sama5_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.52-30-ge4f3e790ad5… HTML log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.52-30-ge4f3e790ad5… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05/armel/basel… * baseline.login: https://kernelci.org/test/case/id/5f11c73b8b65ca755185bb26 failing since 96 days (last pass: v5.4.30-54-g6f04e8ca5355, first fail: v5.4.30-81-gf163418797b9) platform | arch | lab | compiler | defconfig | results -----------------------------+-------+--------------+----------+-----------------+-------- meson-gxl-s805x-libretech-ac | arm64 | lab-baylibre | gcc-8 | defconfig | 4/5 Details: https://kernelci.org/test/plan/id/5f11c7b1e1a5068ffc85bb29 Results: 4 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-8 (aarch64-linux-gnu-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.52-30-ge4f3e790ad5… HTML log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.52-30-ge4f3e790ad5… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05/arm64/basel… * baseline.dmesg.emerg: https://kernelci.org/test/case/id/5f11c7b1e1a5068ffc85bb2e new failure (last pass: v5.4.52) 2 lines

4 years, 5 months

1
0
0 0

[PATCH 03/13] fs/kernel_read_file: Remove FIRMWARE_EFI_EMBEDDED enum

by Kees Cook

The "FIRMWARE_EFI_EMBEDDED" enum is a "where", not a "what". It should not be distinguished separately from just "FIRMWARE", as this confuses the LSMs about what is being loaded. Additionally, there was no actual validation of the firmware contents happening. Fixes: e4c2c0ff00ec ("firmware: Add new platform fallback mechanism and firmware_request_platform()") Cc: stable(a)vger.kernel.org Signed-off-by: Kees Cook <keescook(a)chromium.org> --- To aid in backporting, this change is made before moving kernel_read_file() to separate header/source files. --- drivers/base/firmware_loader/fallback_platform.c | 2 +- include/linux/fs.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/base/firmware_loader/fallback_platform.c b/drivers/base/firmware_loader/fallback_platform.c index 685edb7dd05a..6958ab1a8059 100644 --- a/drivers/base/firmware_loader/fallback_platform.c +++ b/drivers/base/firmware_loader/fallback_platform.c @@ -17,7 +17,7 @@ int firmware_fallback_platform(struct fw_priv *fw_priv, u32 opt_flags) if (!(opt_flags & FW_OPT_FALLBACK_PLATFORM)) return -ENOENT; - rc = security_kernel_load_data(LOADING_FIRMWARE_EFI_EMBEDDED); + rc = security_kernel_load_data(LOADING_FIRMWARE); if (rc) return rc; diff --git a/include/linux/fs.h b/include/linux/fs.h index 95fc775ed937..f50a35d54a61 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2993,11 +2993,10 @@ static inline void i_readcount_inc(struct inode *inode) #endif extern int do_pipe_flags(int *, int); -/* This is a list of *what* is being read, not *how*. */ +/* This is a list of *what* is being read, not *how* nor *where*. */ #define __kernel_read_file_id(id) \ id(UNKNOWN, unknown) \ id(FIRMWARE, firmware) \ - id(FIRMWARE_EFI_EMBEDDED, firmware) \ id(MODULE, kernel-module) \ id(KEXEC_IMAGE, kexec-image) \ id(KEXEC_INITRAMFS, kexec-initramfs) \ -- 2.25.1

4 years, 5 months

2
1
0 0

✅ PASS: Test report for kernel 5.7.10-rc1-f8de612.cki (stable)

by CKI Project

Hello, We ran automated tests on a recent commit from this kernel tree: Kernel repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Commit: f8de612e6e23 - Linux 5.7.10-rc1 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK All kernel binaries, config files, and logs are available for download here: https://cki-artifacts.s3.us-east-2.amazonaws.com/index.html?prefix=dataware… Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg ppc64le: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg s390x: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg x86_64: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ✅ Boot test ✅ ACPI table test ✅ ACPI enabled test ✅ Podman system integration test - as root ✅ Podman system integration test - as user ✅ LTP ✅ Loopdev Sanity ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Networking bridge: sanity ✅ Ethernet drivers sanity ✅ Networking socket: fuzz ✅ Networking: igmp conformance test ✅ Networking route: pmtu ✅ Networking route_func - local ✅ Networking route_func - forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns - transport ✅ Networking ipsec: basic netns - tunnel ✅ Libkcapi AF_ALG test ✅ pciutils: update pci ids test ✅ ALSA PCM loopback test ✅ ALSA Control (mixer) Userspace Element test ✅ storage: SCSI VPD 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ jvm - DaCapo Benchmark Suite 🚧 ✅ jvm - jcstress tests 🚧 ✅ Memory function: kaslr 🚧 ✅ Networking firewall: basic netfilter test 🚧 ✅ audit: audit testsuite test 🚧 ✅ trace: ftrace/tracer 🚧 ✅ kdump - kexec_boot Host 2: ⚡ Internal infrastructure issues prevented one or more tests (marked with ⚡⚡⚡) from running on this architecture. This is not the fault of the kernel that was tested. ✅ Boot test ✅ xfstests - ext4 ✅ xfstests - xfs ⚡⚡⚡ selinux-policy: serge-testsuite ✅ storage: software RAID testing ✅ stress: stress-ng 🚧 ✅ xfstests - btrfs 🚧 ✅ IPMI driver test 🚧 ✅ IPMItool loop stress test 🚧 ✅ Storage blktests Host 3: ✅ Boot test ✅ xfstests - ext4 ✅ xfstests - xfs ✅ selinux-policy: serge-testsuite ✅ storage: software RAID testing ✅ stress: stress-ng 🚧 ✅ xfstests - btrfs 🚧 ✅ IPMI driver test 🚧 ✅ IPMItool loop stress test 🚧 ✅ Storage blktests ppc64le: Host 1: ⚡ Internal infrastructure issues prevented one or more tests (marked with ⚡⚡⚡) from running on this architecture. This is not the fault of the kernel that was tested. ✅ Boot test ✅ xfstests - ext4 ✅ xfstests - xfs ⚡⚡⚡ selinux-policy: serge-testsuite ✅ storage: software RAID testing 🚧 ❌ xfstests - btrfs 🚧 ✅ IPMI driver test 🚧 ✅ IPMItool loop stress test 🚧 ✅ Storage blktests Host 2: ✅ Boot test ✅ Podman system integration test - as root ✅ Podman system integration test - as user ✅ LTP ✅ Loopdev Sanity ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Networking bridge: sanity ✅ Ethernet drivers sanity ✅ Networking socket: fuzz ✅ Networking route: pmtu ✅ Networking route_func - local ✅ Networking route_func - forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns - tunnel ✅ Libkcapi AF_ALG test ✅ pciutils: update pci ids test ✅ ALSA PCM loopback test ✅ ALSA Control (mixer) Userspace Element test 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ jvm - DaCapo Benchmark Suite 🚧 ✅ jvm - jcstress tests 🚧 ✅ Memory function: kaslr 🚧 ✅ Networking firewall: basic netfilter test 🚧 ✅ audit: audit testsuite test 🚧 ✅ trace: ftrace/tracer Host 3: ⚡ Internal infrastructure issues prevented one or more tests (marked with ⚡⚡⚡) from running on this architecture. This is not the fault of the kernel that was tested. ✅ Boot test 🚧 ⚡⚡⚡ kdump - sysrq-c s390x: Host 1: ✅ Boot test ✅ selinux-policy: serge-testsuite ✅ stress: stress-ng 🚧 ✅ Storage blktests Host 2: ✅ Boot test ✅ Podman system integration test - as root ✅ Podman system integration test - as user ✅ LTP ✅ Loopdev Sanity ✅ Memory function: memfd_create ✅ Networking bridge: sanity ✅ Ethernet drivers sanity ✅ Networking route: pmtu ✅ Networking route_func - local ✅ Networking route_func - forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns - transport ✅ Networking ipsec: basic netns - tunnel ✅ Libkcapi AF_ALG test 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ jvm - DaCapo Benchmark Suite 🚧 ✅ jvm - jcstress tests 🚧 ✅ Memory function: kaslr 🚧 ✅ Networking firewall: basic netfilter test 🚧 ✅ audit: audit testsuite test 🚧 ✅ trace: ftrace/tracer 🚧 ✅ kdump - kexec_boot Host 3: ⚡ Internal infrastructure issues prevented one or more tests (marked with ⚡⚡⚡) from running on this architecture. This is not the fault of the kernel that was tested. ✅ Boot test 🚧 ⚡⚡⚡ kdump - sysrq-c 🚧 ⚡⚡⚡ kdump - file-load x86_64: Host 1: ✅ Boot test ✅ ACPI table test ✅ Podman system integration test - as root ✅ Podman system integration test - as user ✅ LTP ✅ Loopdev Sanity ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Networking bridge: sanity ✅ Ethernet drivers sanity ✅ Networking socket: fuzz ✅ Networking: igmp conformance test ✅ Networking route: pmtu ✅ Networking route_func - local ✅ Networking route_func - forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns - transport ✅ Networking ipsec: basic netns - tunnel ✅ Libkcapi AF_ALG test ✅ pciutils: sanity smoke test ✅ pciutils: update pci ids test ✅ ALSA PCM loopback test ✅ ALSA Control (mixer) Userspace Element test ✅ storage: SCSI VPD 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ jvm - DaCapo Benchmark Suite 🚧 ✅ jvm - jcstress tests 🚧 ✅ Memory function: kaslr 🚧 ✅ Networking firewall: basic netfilter test 🚧 ✅ audit: audit testsuite test 🚧 ✅ trace: ftrace/tracer 🚧 ✅ kdump - kexec_boot Host 2: ✅ Boot test 🚧 ✅ kdump - sysrq-c 🚧 ✅ kdump - file-load Host 3: ⚡ Internal infrastructure issues prevented one or more tests (marked with ⚡⚡⚡) from running on this architecture. This is not the fault of the kernel that was tested. ✅ Boot test ✅ xfstests - ext4 ✅ xfstests - xfs ⚡⚡⚡ selinux-policy: serge-testsuite ✅ storage: software RAID testing ✅ stress: stress-ng 🚧 ✅ CPU: Frequency Driver Test 🚧 ✅ CPU: Idle Test 🚧 ✅ xfstests - btrfs 🚧 ✅ IOMMU boot test 🚧 ✅ IPMI driver test 🚧 ✅ IPMItool loop stress test 🚧 ✅ power-management: cpupower/sanity test 🚧 ✅ Storage blktests Host 4: ✅ Boot test ✅ xfstests - ext4 ✅ xfstests - xfs ✅ selinux-policy: serge-testsuite ✅ storage: software RAID testing ✅ stress: stress-ng 🚧 ✅ CPU: Frequency Driver Test 🚧 ✅ CPU: Idle Test 🚧 ❌ xfstests - btrfs 🚧 ✅ IOMMU boot test 🚧 ✅ IPMI driver test 🚧 ✅ IPMItool loop stress test 🚧 ✅ power-management: cpupower/sanity test 🚧 ✅ Storage blktests Test sources: https://gitlab.com/cki-project/kernel-tests 💚 Pull requests are welcome for new tests or improvements to existing tests! Aborted tests ------------- Tests that didn't complete running successfully are marked with ⚡⚡⚡. If this was caused by an infrastructure issue, we try to mark that explicitly in the report. Waived tests ------------ If the test run included waived tests, they are marked with 🚧. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed. Testing timeout --------------- We aim to provide a report within reasonable timeframe. Tests that haven't finished running yet are marked with ⏱.

4 years, 5 months

1
0
0 0

[PATCH 02/13] fs/kernel_read_file: Remove FIRMWARE_PREALLOC_BUFFER enum

by Kees Cook

FIRMWARE_PREALLOC_BUFFER is a "how", not a "what", and confuses the LSMs that are interested in filtering between types of things. The "how" should be an internal detail made uninteresting to the LSMs. Fixes: a098ecd2fa7d ("firmware: support loading into a pre-allocated buffer") Fixes: fd90bc559bfb ("ima: based on policy verify firmware signatures (pre-allocated buffer)") Fixes: 4f0496d8ffa3 ("ima: based on policy warn about loading firmware (pre-allocated buffer)") Cc: stable(a)vger.kernel.org Signed-off-by: Kees Cook <keescook(a)chromium.org> --- To aid in backporting, this change is made before moving kernel_read_file() to separate header/source files. --- drivers/base/firmware_loader/main.c | 5 ++--- fs/exec.c | 7 ++++--- include/linux/fs.h | 2 +- kernel/module.c | 2 +- security/integrity/digsig.c | 2 +- security/integrity/ima/ima_fs.c | 2 +- security/integrity/ima/ima_main.c | 6 ++---- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c index ca871b13524e..c2f57cedcd6f 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -465,14 +465,12 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, int i, len; int rc = -ENOENT; char *path; - enum kernel_read_file_id id = READING_FIRMWARE; size_t msize = INT_MAX; void *buffer = NULL; /* Already populated data member means we're loading into a buffer */ if (!decompress && fw_priv->data) { buffer = fw_priv->data; - id = READING_FIRMWARE_PREALLOC_BUFFER; msize = fw_priv->allocated_size; } @@ -496,7 +494,8 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, /* load firmware files from the mount namespace of init */ rc = kernel_read_file_from_path_initns(path, &buffer, - &size, msize, id); + &size, msize, + READING_FIRMWARE); if (rc) { if (rc != -ENOENT) dev_warn(device, "loading %s failed with error %d\n", diff --git a/fs/exec.c b/fs/exec.c index e6e8a9a70327..2bf549757ce7 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -927,6 +927,7 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size, { loff_t i_size, pos; ssize_t bytes = 0; + void *allocated = NULL; int ret; if (!S_ISREG(file_inode(file)->i_mode) || max_size < 0) @@ -950,8 +951,8 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size, goto out; } - if (id != READING_FIRMWARE_PREALLOC_BUFFER) - *buf = vmalloc(i_size); + if (!*buf) + *buf = allocated = vmalloc(i_size); if (!*buf) { ret = -ENOMEM; goto out; @@ -980,7 +981,7 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size, out_free: if (ret < 0) { - if (id != READING_FIRMWARE_PREALLOC_BUFFER) { + if (allocated) { vfree(*buf); *buf = NULL; } diff --git a/include/linux/fs.h b/include/linux/fs.h index 3f881a892ea7..95fc775ed937 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2993,10 +2993,10 @@ static inline void i_readcount_inc(struct inode *inode) #endif extern int do_pipe_flags(int *, int); +/* This is a list of *what* is being read, not *how*. */ #define __kernel_read_file_id(id) \ id(UNKNOWN, unknown) \ id(FIRMWARE, firmware) \ - id(FIRMWARE_PREALLOC_BUFFER, firmware) \ id(FIRMWARE_EFI_EMBEDDED, firmware) \ id(MODULE, kernel-module) \ id(KEXEC_IMAGE, kexec-image) \ diff --git a/kernel/module.c b/kernel/module.c index 0c6573b98c36..26105148f4d2 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3988,7 +3988,7 @@ SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags) { struct load_info info = { }; loff_t size; - void *hdr; + void *hdr = NULL; int err; err = may_init_module(); diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c index e9cbadade74b..ac02b7632353 100644 --- a/security/integrity/digsig.c +++ b/security/integrity/digsig.c @@ -169,7 +169,7 @@ int __init integrity_add_key(const unsigned int id, const void *data, int __init integrity_load_x509(const unsigned int id, const char *path) { - void *data; + void *data = NULL; loff_t size; int rc; key_perm_t perm; diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c index e3fcad871861..15a44c5022f7 100644 --- a/security/integrity/ima/ima_fs.c +++ b/security/integrity/ima/ima_fs.c @@ -272,7 +272,7 @@ static const struct file_operations ima_ascii_measurements_ops = { static ssize_t ima_read_policy(char *path) { - void *data; + void *data = NULL; char *datap; loff_t size; int rc, pathlen = strlen(path); diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index c1583d98c5e5..f80ee4ce4669 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -611,19 +611,17 @@ void ima_post_path_mknod(struct dentry *dentry) int ima_read_file(struct file *file, enum kernel_read_file_id read_id) { /* - * READING_FIRMWARE_PREALLOC_BUFFER - * * Do devices using pre-allocated memory run the risk of the * firmware being accessible to the device prior to the completion * of IMA's signature verification any more than when using two - * buffers? + * buffers? It may be desirable to include the buffer address + * in this API and walk all the dma_map_single() mappings to check. */ return 0; } const int read_idmap[READING_MAX_ID] = { [READING_FIRMWARE] = FIRMWARE_CHECK, - [READING_FIRMWARE_PREALLOC_BUFFER] = FIRMWARE_CHECK, [READING_MODULE] = MODULE_CHECK, [READING_KEXEC_IMAGE] = KEXEC_KERNEL_CHECK, [READING_KEXEC_INITRAMFS] = KEXEC_INITRAMFS_CHECK, -- 2.25.1

4 years, 5 months

2
1
0 0

[PATCH 01/13] firmware_loader: EFI firmware loader must handle pre-allocated buffer

by Kees Cook

The EFI platform firmware fallback would clobber any pre-allocated buffers. Instead, correctly refuse to reallocate when too small (as already done in the sysfs fallback), or perform allocation normally when needed. Fixes: e4c2c0ff00ec ("firmware: Add new platform fallback mechanism and firm ware_request_platform()") Cc: stable(a)vger.kernel.org Signed-off-by: Kees Cook <keescook(a)chromium.org> --- To aid in backporting, this change is made before moving kernel_read_file() to separate header/source files. --- drivers/base/firmware_loader/fallback_platform.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/base/firmware_loader/fallback_platform.c b/drivers/base/firmware_loader/fallback_platform.c index cdd2c9a9f38a..685edb7dd05a 100644 --- a/drivers/base/firmware_loader/fallback_platform.c +++ b/drivers/base/firmware_loader/fallback_platform.c @@ -25,7 +25,10 @@ int firmware_fallback_platform(struct fw_priv *fw_priv, u32 opt_flags) if (rc) return rc; /* rc == -ENOENT when the fw was not found */ - fw_priv->data = vmalloc(size); + if (fw_priv->data && size > fw_priv->allocated_size) + return -ENOMEM; + if (!fw_priv->data) + fw_priv->data = vmalloc(size); if (!fw_priv->data) return -ENOMEM; -- 2.25.1

4 years, 5 months

2
1
0 0

stable-rc/linux-4.14.y baseline: 80 runs, 2 regressions (v4.14.188-55-g403ad3c8edab)

by kernelci.org bot

stable-rc/linux-4.14.y baseline: 80 runs, 2 regressions (v4.14.188-55-g403ad3c8edab) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | results ---------------------+-------+--------------+----------+-----------+-------- meson-gxbb-p200 | arm64 | lab-baylibre | gcc-8 | defconfig | 0/1 meson-gxl-s905d-p230 | arm64 | lab-baylibre | gcc-8 | defconfig | 0/1 Details: https://kernelci.org/test/job/stable-rc/branch/linux-4.14.y/kernel/v4.14.18… Test: baseline Tree: stable-rc Branch: linux-4.14.y Describe: v4.14.188-55-g403ad3c8edab URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 403ad3c8edabb297b89be39c770f7a1ce91c296a Test Regressions ---------------- platform | arch | lab | compiler | defconfig | results ---------------------+-------+--------------+----------+-----------+-------- meson-gxbb-p200 | arm64 | lab-baylibre | gcc-8 | defconfig | 0/1 Details: https://kernelci.org/test/plan/id/5f11b7f04dd79be23d85bb2f Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-8 (aarch64-linux-gnu-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.14.y/v4.14.188-55-g403ad3c8… HTML log: https://storage.kernelci.org//stable-rc/linux-4.14.y/v4.14.188-55-g403ad3c8… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05/arm64/basel… * baseline.login: https://kernelci.org/test/case/id/5f11b7f04dd79be23d85bb30 failing since 108 days (last pass: v4.14.172-114-g734382e2d26e, first fail: v4.14.174-131-g234ce78cac23) platform | arch | lab | compiler | defconfig | results ---------------------+-------+--------------+----------+-----------+-------- meson-gxl-s905d-p230 | arm64 | lab-baylibre | gcc-8 | defconfig | 0/1 Details: https://kernelci.org/test/plan/id/5f11b78c33e771943885bb41 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-8 (aarch64-linux-gnu-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.14.y/v4.14.188-55-g403ad3c8… HTML log: https://storage.kernelci.org//stable-rc/linux-4.14.y/v4.14.188-55-g403ad3c8… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05/arm64/basel… * baseline.login: https://kernelci.org/test/case/id/5f11b78c33e771943885bb42 new failure (last pass: v4.14.188)

4 years, 5 months

1
0
0 0

[PATCH 4.14 000/136] 4.14.186-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.186 release. There are 136 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu, 25 Jun 2020 19:52:30 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.186-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.186-rc1 Ahmed S. Darwish <a.darwish(a)linutronix.de> net: core: device_rename: Use rwsem instead of a seqcount Thomas Gleixner <tglx(a)linutronix.de> sched/rt, net: Use CONFIG_PREEMPTION.patch Jiri Olsa <jolsa(a)redhat.com> kretprobe: Prevent triggering kretprobe from within kprobe_flush_task Chen Yu <yu.c.chen(a)intel.com> e1000e: Do not wake up the system via WOL if device wakeup is disabled Masami Hiramatsu <mhiramat(a)kernel.org> kprobes: Fix to protect kick_kprobe_optimizer() by kprobe_mutex Eric Biggers <ebiggers(a)google.com> crypto: algboss - don't wait during notifier callback Herbert Xu <herbert(a)gondor.apana.org.au> crypto: algif_skcipher - Cap recv SG list at ctx->used Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: tmio: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: mtk: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: plat_nand: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: socrates: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: oxnas: Fix the probe error path Nishka Dasgupta <nishkadg.linux(a)gmail.com> mtd: rawnand: oxnas: Add of_node_put() Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: orion: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: xway: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: sharpsl: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: diskonchip: Fix the probe error path Boris Brezillon <boris.brezillon(a)bootlin.com> mtd: rawnand: Pass a nand_chip object to nand_release() Ahmed S. Darwish <a.darwish(a)linutronix.de> block: nr_sects_write(): Disable preemption on seqcount write Ard Biesheuvel <ardb(a)kernel.org> x86/boot/compressed: Relax sed symbol type regex for LLVM ld.lld Lyude Paul <lyude(a)redhat.com> drm/dp_mst: Increase ACT retry timeout to 3s Jeffle Xu <jefflexu(a)linux.alibaba.com> ext4: fix partial cluster initialization when splitting extent Tom Rix <trix(a)redhat.com> selinux: fix double free Huacai Chen <chenhc(a)lemote.com> drm/qxl: Use correct notify port address when creating cursor ring Lyude Paul <lyude(a)redhat.com> drm/dp_mst: Reformat drm_dp_check_act_status() a bit Wolfram Sang <wsa+renesas(a)sang-engineering.com> drm: encoder_slave: fix refcouting error for modules Kai-Heng Feng <kai.heng.feng(a)canonical.com> libata: Use per port sync for detach Will Deacon <will(a)kernel.org> arm64: hw_breakpoint: Don't invoke overflow handler on uaccess watchpoints Jason Yan <yanaijie(a)huawei.com> block: Fix use-after-free in blkdev_get() Zhiqiang Liu <liuzhiqiang26(a)huawei.com> bcache: fix potential deadlock problem in btree_gc_coalesce Gaurav Singh <gaurav1086(a)gmail.com> perf report: Fix NULL pointer dereference in hists__fprintf_nr_sample_events() Qais Yousef <qais.yousef(a)arm.com> usb/ehci-platform: Set PM runtime as active on resume Qais Yousef <qais.yousef(a)arm.com> usb/xhci-plat: Set PM runtime as active on resume Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> scsi: acornscsi: Fix an error handling path in acornscsi_probe() Jernej Skrabec <jernej.skrabec(a)siol.net> drm/sun4i: hdmi ddc clk: Fix size of m divider tannerlove <tannerlove(a)google.com> selftests/net: in timestamping, strncpy needs to preserve null byte Bob Peterson <rpeterso(a)redhat.com> gfs2: fix use-after-free on transaction ail lists Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> blktrace: fix endianness for blk_log_remap() Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> blktrace: fix endianness in get_pdu_int() Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> blktrace: use errno instead of bi_status Ram Pai <linuxram(a)us.ibm.com> selftests/vm/pkeys: fix alloc_random_pkey() to make it really random Nick Desaulniers <ndesaulniers(a)google.com> elfnote: mark all .note sections SHF_ALLOC Arnd Bergmann <arnd(a)arndb.de> include/linux/bitops.h: avoid clang shift-count-overflow warnings Jann Horn <jannh(a)google.com> lib/zlib: remove outdated and incorrect pre-increment optimization Jiri Benc <jbenc(a)redhat.com> geneve: change from tx_error to tx_dropped on missing metadata Tero Kristo <t-kristo(a)ti.com> crypto: omap-sham - add proper load balancing support for multicore Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> pinctrl: freescale: imx: Fix an error handling path in 'imx_pinctrl_probe()' Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> pinctrl: imxl: Fix an error handling path in 'imx1_pinctrl_core_probe()' Can Guo <cang(a)codeaurora.org> scsi: ufs: Don't update urgent bkops level when toggling auto bkops Qiushi Wu <wu000273(a)umn.edu> scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj Bob Peterson <rpeterso(a)redhat.com> gfs2: Allow lock_nolock mount to specify jid=X Stafford Horne <shorne(a)gmail.com> openrisc: Fix issue with argument clobbering for clone/fork Qiushi Wu <wu000273(a)umn.edu> vfio/mdev: Fix reference count leak in add_mdev_supported_type Xiyu Yang <xiyuyang19(a)fudan.edu.cn> ASoC: fsl_asrc_dma: Fix dma_chan leak when config DMA channel failed Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> extcon: adc-jack: Fix an error handling path in 'adc_jack_probe()' huhai <huhai(a)tj.kylinos.cn> powerpc/4xx: Don't unmap NULL mbase Olga Kornievskaia <olga.kornievskaia(a)gmail.com> NFSv4.1 fix rpc_call_done assignment for BIND_CONN_TO_SESSION Fedor Tokarev <ftokarev(a)gmail.com> net: sunrpc: Fix off-by-one issues in 'rpc_ntop6' Jeffrey Hugo <jeffrey.l.hugo(a)gmail.com> scsi: ufs-qcom: Fix scheduling while atomic issue Nathan Chancellor <natechancellor(a)gmail.com> clk: bcm2835: Fix return type of bcm2835_register_gate Borislav Petkov <bp(a)suse.de> x86/apic: Make TSC deadline timer detection message visible Pawel Laszczak <pawell(a)cadence.com> usb: gadget: Fix issue with config_ep_by_speed function Qiushi Wu <wu000273(a)umn.edu> usb: gadget: fix potential double-free in m66592_probe. Colin Ian King <colin.king(a)canonical.com> usb: gadget: lpc32xx_udc: don't dereference ep pointer before null check Nathan Chancellor <natechancellor(a)gmail.com> USB: gadget: udc: s3c2410_udc: Remove pointless NULL check in s3c2410_udc_nuke Fabrice Gasnier <fabrice.gasnier(a)st.com> usb: dwc2: gadget: move gadget resume after the core is in L0 state Stefan Riedmueller <s.riedmueller(a)phytec.de> watchdog: da9062: No need to ping manually before setting timeout Maor Gottlieb <maorg(a)mellanox.com> IB/cma: Fix ports memory leak in cma_configfs Bjorn Helgaas <bhelgaas(a)google.com> PCI/PTM: Inherit Switch Downstream Port PTM settings from Upstream Port Hannes Reinecke <hare(a)suse.de> dm zoned: return NULL if dmz_get_zone_for_reclaim() fails to find a zone Qian Cai <cai(a)lca.pw> powerpc/64s/pgtable: fix an undefined behaviour Marek Szyprowski <m.szyprowski(a)samsung.com> clk: samsung: exynos5433: Add IGNORE_UNUSED flag to sclk_i2s1 Gregory CLEMENT <gregory.clement(a)bootlin.com> tty: n_gsm: Fix bogus i++ in gsm_data_kick Tang Bin <tangbin(a)cmss.chinamobile.com> USB: host: ehci-mxc: Add error handling in ehci_mxc_drv_probe() Roy Spliet <nouveau(a)spliet.org> drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation Qais Yousef <qais.yousef(a)arm.com> usb/ohci-platform: Fix a warning when hibernating Alex Williamson <alex.williamson(a)redhat.com> vfio-pci: Mask cap zero Geoff Levand <geoff(a)infradead.org> powerpc/ps3: Fix kexec shutdown hang Nicholas Piggin <npiggin(a)gmail.com> powerpc/pseries/ras: Fix FWNMI_VALID off by one Gregory CLEMENT <gregory.clement(a)bootlin.com> tty: n_gsm: Fix waking up upper tty layer when room available Gregory CLEMENT <gregory.clement(a)bootlin.com> tty: n_gsm: Fix SOF skipping Rob Herring <robh(a)kernel.org> PCI: Fix pci_register_host_bridge() device_register() error handling Tero Kristo <t-kristo(a)ti.com> clk: ti: composite: fix memory leak Arnd Bergmann <arnd(a)arndb.de> dlm: remove BUG() before panic() Suganath Prabu S <suganath-prabu.subramani(a)broadcom.com> scsi: mpt3sas: Fix double free warnings Dmitry Osipenko <digetx(a)gmail.com> power: supply: smb347-charger: IRQSTAT_D is volatile Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> power: supply: lp8788: Fix an error handling path in 'lp8788_charger_probe()' Viacheslav Dubeyko <v.dubeiko(a)yadro.com> scsi: qla2xxx: Fix warning after FC target reset Kai-Heng Feng <kai.heng.feng(a)canonical.com> PCI/ASPM: Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges Andrew Murray <andrew.murray(a)arm.com> PCI: rcar: Fix incorrect programming of OB windows Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy(a)linux.intel.com> drivers: base: Fix NULL pointer exception in __platform_driver_probe() if a driver developer is foolish John Stultz <john.stultz(a)linaro.org> serial: amba-pl011: Make sure we initialize the port.lock spinlock Russell King <rmk+kernel(a)armlinux.org.uk> i2c: pxa: fix i2c_pxa_scream_blue_murder() debug output Matej Dujava <mdujava(a)kocurkovo.cz> staging: sm750fb: add missing case while setting FB_VISUAL Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> thermal/drivers/ti-soc-thermal: Avoid dereferencing ERR_PTR Raghavendra Rao Ananta <rananta(a)codeaurora.org> tty: hvc: Fix data abort due to race in hvc_open Julian Wiedmann <jwi(a)linux.ibm.com> s390/qdio: put thinint indicator after early error Alexander Tsoy <alexander(a)tsoy.me> ALSA: usb-audio: Improve frames size computation Nilesh Javali <njavali(a)marvell.com> scsi: qedi: Do not flush offload work if ARP not resolved Aiman Najjar <aiman.najjar(a)hurranet.com> staging: rtl8712: fix multiline derefernce warnings Chen Zhou <chenzhou10(a)huawei.com> staging: greybus: fix a missing-check bug in gb_lights_light_config() Tyrel Datwyler <tyreld(a)linux.ibm.com> scsi: ibmvscsi: Don't send host info in adapter info MAD after LPM Simon Arlott <simon(a)octiron.net> scsi: sr: Fix sr_probe() missing deallocate of device minor John Johansen <john.johansen(a)canonical.com> apparmor: fix introspection of of task mode for unconfined tasks ashimida <ashimida(a)linux.alibaba.com> mksysmap: Fix the mismatch of '.L' symbols in System.map Logan Gunthorpe <logang(a)deltatee.com> NTB: Fix the default port and peer numbers for legacy drivers Wang Hai <wanghai38(a)huawei.com> yam: fix possible memory leak in yam_init_driver Pingfan Liu <kernelfans(a)gmail.com> powerpc/crashkernel: Take "mem=" option into account Xiyu Yang <xiyuyang19(a)fudan.edu.cn> nfsd: Fix svc_xprt refcnt leak when setup callback client failed Kajol Jain <kjain(a)linux.ibm.com> powerpc/perf/hv-24x7: Fix inconsistent output values incase multiple hv-24x7 events run Alain Volmat <avolmat(a)me.com> clk: clk-flexgen: fix clock-critical handling Xiyu Yang <xiyuyang19(a)fudan.edu.cn> scsi: lpfc: Fix lpfc_nodelist leak when processing unsolicited event Marek Szyprowski <m.szyprowski(a)samsung.com> mfd: wm8994: Fix driver operation if loaded as modules Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> m68k/PCI: Fix a memory leak in an error handling path Qian Cai <cai(a)lca.pw> vfio/pci: fix memory leaks in alloc_perm_bits() Emmanuel Nicolet <emmanuel.nicolet(a)gmail.com> ps3disk: use the default segment boundary Pali Rohár <pali(a)kernel.org> PCI: aardvark: Don't blindly enable ASPM L0s and don't write to read-only register Martin Wilck <mwilck(a)suse.com> dm mpath: switch paths in dm_blk_ioctl() code path Oliver Neukum <oneukum(a)suse.com> usblp: poison URBs upon disconnect Russell King <rmk+kernel(a)armlinux.org.uk> i2c: pxa: clear all master action bits in i2c_pxa_stop_message() Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> f2fs: report delalloc reserve as non-free in statfs for project quota Andreas Klinger <ak(a)it-klinger.de> iio: bmp280: fix compensation of humidity Viacheslav Dubeyko <v.dubeiko(a)yadro.com> scsi: qla2xxx: Fix issue with adapter's stopping state Dan Carpenter <dan.carpenter(a)oracle.com> ALSA: isa/wavefront: prevent out of bounds write in ioctl Dan Carpenter <dan.carpenter(a)oracle.com> scsi: qedi: Check for buffer overflow in qedi_set_path() Linus Walleij <linus.walleij(a)linaro.org> ARM: integrator: Add some Kconfig selections Xiyu Yang <xiyuyang19(a)fudan.edu.cn> ASoC: davinci-mcasp: Fix dma_chan refcnt leak when getting dma type Jon Hunter <jonathanh(a)nvidia.com> backlight: lp855x: Ensure regulators are disabled on probe failure Bryan O'Donoghue <bryan.odonoghue(a)linaro.org> clk: qcom: msm8916: Fix the address location of pll->config_reg Alex Elder <elder(a)linaro.org> remoteproc: Fix IDR initialisation in rproc_alloc() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> iio: pressure: bmp280: Tolerate IRQ before registering Adam Honse <calcprogrammer1(a)gmail.com> i2c: piix4: Detect secondary SMBus controller on AMD AM4 chipsets Rikard Falkeborn <rikard.falkeborn(a)gmail.com> clk: sunxi: Fix incorrect usage of round_down() Enric Balletbo i Serra <enric.balletbo(a)collabora.com> power: supply: bq24257_charger: Replace depends on REGMAP_I2C with select Chris Wilson <chris(a)chris-wilson.co.uk> drm/i915: Whitelist context-local timestamp in the gen9 cmdparser Dmitry V. Levin <ldv(a)altlinux.org> s390: fix syscall_get_error for compat processes ------------- Diffstat: Documentation/driver-api/mtdnand.rst | 2 +- Makefile | 4 +- arch/arm/mach-integrator/Kconfig | 7 +- arch/arm64/kernel/hw_breakpoint.c | 44 ++++++----- arch/m68k/coldfire/pci.c | 4 +- arch/openrisc/kernel/entry.S | 4 +- arch/powerpc/include/asm/book3s/64/pgtable.h | 23 +++++- arch/powerpc/kernel/machine_kexec.c | 8 +- arch/powerpc/perf/hv-24x7.c | 10 --- arch/powerpc/platforms/4xx/pci.c | 4 +- arch/powerpc/platforms/ps3/mm.c | 22 +++--- arch/powerpc/platforms/pseries/ras.c | 5 +- arch/s390/include/asm/syscall.h | 12 ++- arch/x86/boot/Makefile | 2 +- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/kprobes/core.c | 16 +--- crypto/algboss.c | 2 - crypto/algif_skcipher.c | 6 +- drivers/ata/libata-core.c | 11 ++- drivers/base/platform.c | 2 + drivers/block/ps3disk.c | 1 - drivers/clk/bcm/clk-bcm2835.c | 10 +-- drivers/clk/qcom/gcc-msm8916.c | 8 +- drivers/clk/samsung/clk-exynos5433.c | 3 +- drivers/clk/st/clk-flexgen.c | 1 + drivers/clk/sunxi/clk-sunxi.c | 2 +- drivers/clk/ti/composite.c | 1 + drivers/crypto/omap-sham.c | 64 ++++++++------- drivers/extcon/extcon-adc-jack.c | 3 +- drivers/gpu/drm/drm_dp_mst_topology.c | 58 ++++++++------ drivers/gpu/drm/drm_encoder_slave.c | 5 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 4 + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 3 +- drivers/gpu/drm/qxl/qxl_kms.c | 2 +- drivers/gpu/drm/sun4i/sun4i_hdmi.h | 2 +- drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c | 2 +- drivers/i2c/busses/i2c-piix4.c | 3 +- drivers/i2c/busses/i2c-pxa.c | 13 ++-- drivers/iio/pressure/bmp280-core.c | 7 +- drivers/infiniband/core/cma_configfs.c | 13 ++++ drivers/md/bcache/btree.c | 8 +- drivers/md/dm-mpath.c | 2 +- drivers/md/dm-zoned-metadata.c | 4 +- drivers/md/dm-zoned-reclaim.c | 4 +- drivers/mfd/wm8994-core.c | 1 + drivers/mtd/nand/ams-delta.c | 2 +- drivers/mtd/nand/au1550nd.c | 2 +- drivers/mtd/nand/bcm47xxnflash/main.c | 2 +- drivers/mtd/nand/brcmnand/brcmnand.c | 2 +- drivers/mtd/nand/cafe_nand.c | 2 +- drivers/mtd/nand/cmx270_nand.c | 2 +- drivers/mtd/nand/cs553x_nand.c | 2 +- drivers/mtd/nand/davinci_nand.c | 2 +- drivers/mtd/nand/denali.c | 4 +- drivers/mtd/nand/diskonchip.c | 9 +-- drivers/mtd/nand/docg4.c | 4 +- drivers/mtd/nand/fsl_elbc_nand.c | 2 +- drivers/mtd/nand/fsl_ifc_nand.c | 2 +- drivers/mtd/nand/fsl_upm.c | 2 +- drivers/mtd/nand/fsmc_nand.c | 2 +- drivers/mtd/nand/gpio.c | 2 +- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 +- drivers/mtd/nand/hisi504_nand.c | 5 +- drivers/mtd/nand/jz4740_nand.c | 2 +- drivers/mtd/nand/jz4780_nand.c | 4 +- drivers/mtd/nand/lpc32xx_mlc.c | 3 +- drivers/mtd/nand/lpc32xx_slc.c | 3 +- drivers/mtd/nand/mpc5121_nfc.c | 2 +- drivers/mtd/nand/mtk_nand.c | 4 +- drivers/mtd/nand/mxc_nand.c | 2 +- drivers/mtd/nand/nand_base.c | 8 +- drivers/mtd/nand/nandsim.c | 4 +- drivers/mtd/nand/ndfc.c | 2 +- drivers/mtd/nand/nuc900_nand.c | 2 +- drivers/mtd/nand/omap2.c | 2 +- drivers/mtd/nand/orion_nand.c | 5 +- drivers/mtd/nand/oxnas_nand.c | 16 ++-- drivers/mtd/nand/pasemi_nand.c | 2 +- drivers/mtd/nand/plat_nand.c | 4 +- drivers/mtd/nand/qcom_nandc.c | 2 +- drivers/mtd/nand/r852.c | 4 +- drivers/mtd/nand/s3c2410.c | 2 +- drivers/mtd/nand/sh_flctl.c | 2 +- drivers/mtd/nand/sharpsl.c | 4 +- drivers/mtd/nand/socrates_nand.c | 5 +- drivers/mtd/nand/sunxi_nand.c | 4 +- drivers/mtd/nand/tango_nand.c | 2 +- drivers/mtd/nand/tmio_nand.c | 4 +- drivers/mtd/nand/txx9ndfmc.c | 2 +- drivers/mtd/nand/vf610_nfc.c | 2 +- drivers/mtd/nand/xway_nand.c | 4 +- drivers/net/ethernet/intel/e1000e/netdev.c | 14 +++- drivers/net/geneve.c | 7 +- drivers/net/hamradio/yam.c | 1 + drivers/ntb/ntb.c | 8 +- drivers/pci/host/pci-aardvark.c | 4 - drivers/pci/host/pcie-rcar.c | 9 ++- drivers/pci/pcie/aspm.c | 10 --- drivers/pci/pcie/ptm.c | 22 ++++-- drivers/pci/probe.c | 5 +- drivers/pinctrl/freescale/pinctrl-imx.c | 19 +---- drivers/pinctrl/freescale/pinctrl-imx1-core.c | 1 - drivers/power/supply/Kconfig | 2 +- drivers/power/supply/lp8788-charger.c | 18 +---- drivers/power/supply/smb347-charger.c | 1 + drivers/remoteproc/remoteproc_core.c | 3 +- drivers/s390/cio/qdio.h | 1 - drivers/s390/cio/qdio_setup.c | 1 - drivers/s390/cio/qdio_thinint.c | 14 ++-- drivers/scsi/arm/acornscsi.c | 4 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 2 + drivers/scsi/iscsi_boot_sysfs.c | 2 +- drivers/scsi/lpfc/lpfc_els.c | 2 + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 + drivers/scsi/qedi/qedi_iscsi.c | 7 +- drivers/scsi/qla2xxx/qla_os.c | 1 + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 + drivers/scsi/sr.c | 6 +- drivers/scsi/ufs/ufs-qcom.c | 6 +- drivers/scsi/ufs/ufshcd.c | 1 - drivers/staging/greybus/light.c | 3 +- drivers/staging/rtl8712/rtl871x_xmit.c | 11 +-- drivers/staging/sm750fb/sm750.c | 1 + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 6 +- drivers/tty/hvc/hvc_console.c | 16 +++- drivers/tty/n_gsm.c | 26 ++++--- drivers/tty/serial/amba-pl011.c | 1 + drivers/usb/class/usblp.c | 5 +- drivers/usb/dwc2/core_intr.c | 7 +- drivers/usb/gadget/composite.c | 78 +++++++++++++++---- drivers/usb/gadget/udc/lpc32xx_udc.c | 11 +-- drivers/usb/gadget/udc/m66592-udc.c | 2 +- drivers/usb/gadget/udc/s3c2410_udc.c | 4 - drivers/usb/host/ehci-mxc.c | 2 + drivers/usb/host/ehci-platform.c | 5 ++ drivers/usb/host/ohci-platform.c | 5 ++ drivers/usb/host/xhci-plat.c | 10 ++- drivers/vfio/mdev/mdev_sysfs.c | 2 +- drivers/vfio/pci/vfio_pci_config.c | 14 +++- drivers/video/backlight/lp855x_bl.c | 20 ++++- drivers/watchdog/da9062_wdt.c | 5 -- fs/block_dev.c | 12 +-- fs/dlm/dlm_internal.h | 1 - fs/ext4/extents.c | 2 +- fs/f2fs/super.c | 3 +- fs/gfs2/log.c | 11 ++- fs/gfs2/ops_fstype.c | 2 +- fs/nfs/nfs4proc.c | 2 +- fs/nfsd/nfs4callback.c | 2 + include/linux/bitops.h | 2 +- include/linux/elfnote.h | 2 +- include/linux/genhd.h | 2 + include/linux/kprobes.h | 4 + include/linux/libata.h | 3 + include/linux/mtd/rawnand.h | 6 +- include/linux/usb/composite.h | 3 + kernel/kprobes.c | 27 ++++++- kernel/trace/blktrace.c | 30 +++---- lib/zlib_inflate/inffast.c | 91 +++++++++------------- net/core/dev.c | 40 +++++----- net/sunrpc/addr.c | 4 +- scripts/mksysmap | 2 +- security/apparmor/label.c | 4 +- security/selinux/ss/services.c | 4 + sound/isa/wavefront/wavefront_synth.c | 8 +- sound/soc/davinci/davinci-mcasp.c | 4 +- sound/soc/fsl/fsl_asrc_dma.c | 1 + sound/usb/card.h | 4 + sound/usb/endpoint.c | 43 ++++++++-- sound/usb/endpoint.h | 1 + sound/usb/pcm.c | 2 + tools/perf/builtin-report.c | 3 +- .../networking/timestamping/timestamping.c | 10 ++- tools/testing/selftests/x86/protection_keys.c | 3 +- 174 files changed, 758 insertions(+), 555 deletions(-)

4 years, 5 months

6
141
0 0

[PATCH v2 1/2] bcache: avoid nr_stripes overflow in bcache_device_init()

by Coly Li

For some block devices which large capacity (e.g. 8TB) but small io_opt size (e.g. 8 sectors), in bcache_device_init() the stripes number calcu- lated by, DIV_ROUND_UP_ULL(sectors, d->stripe_size); might be overflow to the unsigned int bcache_device->nr_stripes. This patch uses the uint64_t variable to store DIV_ROUND_UP_ULL() and after the value is checked to be available in unsigned int range, sets it to bache_device->nr_stripes. Then the overflow is avoided. Reported-by: Ken Raeburn <raeburn(a)redhat.com> Signed-off-by: Coly Li <colyli(a)suse.de> Link: https://bugzilla.redhat.com/show_bug.cgi?id=1783075 Cc: stable(a)vger.kernel.org --- Changelog: v2: Improve overflow fix on 32bit machine, suggested by Jens and Ken. v1: initial version. drivers/md/bcache/super.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index a239fcaec70b..7615be9d4498 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -886,19 +886,19 @@ static int bcache_device_init(struct bcache_device *d, unsigned int block_size, struct request_queue *q; const size_t max_stripes = min_t(size_t, INT_MAX, SIZE_MAX / sizeof(atomic_t)); - size_t n; + uint64_t n; int idx; if (!d->stripe_size) d->stripe_size = 1 << 31; - d->nr_stripes = DIV_ROUND_UP_ULL(sectors, d->stripe_size); - - if (!d->nr_stripes || d->nr_stripes > max_stripes) { - pr_err("nr_stripes too large or invalid: %u (start sector beyond end of disk?)\n", - (unsigned int)d->nr_stripes); + n = DIV_ROUND_UP_ULL(sectors, d->stripe_size); + if (!n || n > max_stripes) { + pr_err("nr_stripes too large or invalid: %llu (start sector beyond end of disk?)\n", + n); return -ENOMEM; } + d->nr_stripes = n; n = d->nr_stripes * sizeof(atomic_t); d->stripe_sectors_dirty = kvzalloc(n, GFP_KERNEL); -- 2.26.2

4 years, 5 months

2
3
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2020