- Linux-stable-mirror - lists.linaro.org

[PATCH] mm/hugetlb: fix deadlock in hugetlb_cow error path

by Mike Kravetz

syzbot reported the deadlock here [1]. The issue is in hugetlb cow error handling when there are not enough huge pages for the faulting task which took the original reservation. It is possible that other (child) tasks could have consumed pages associated with the reservation. In this case, we want the task which took the original reservation to succeed. So, we unmap any associated pages in children so that they can be used by the faulting task that owns the reservation. The unmapping code needs to hold i_mmap_rwsem in write mode. However, due to commit c0d0381ade79 ("hugetlbfs: use i_mmap_rwsem for more pmd sharing synchronization") we are already holding i_mmap_rwsem in read mode when hugetlb_cow is called. Technically, i_mmap_rwsem does not need to be held in read mode for COW mappings as they can not share pmd's. Modifying the fault code to not take i_mmap_rwsem in read mode for COW (and other non-sharable) mappings is too involved for a stable fix. Instead, we simply drop the hugetlb_fault_mutex and i_mmap_rwsem before unmapping. This is OK as it is technically not needed. They are reacquired after unmapping as expected by calling code. Since this is done in an uncommon error path, the overhead of dropping and reacquiring mutexes is acceptable. While making changes, remove redundant BUG_ON after unmap_ref_private. [1] https://lkml.kernel.org/r/000000000000b73ccc05b5cf8558@google.com Reported-by: syzbot+5eee4145df3c15e96625(a)syzkaller.appspotmail.com Fixes: c0d0381ade79 ("hugetlbfs: use i_mmap_rwsem for more pmd sharing synchronization") Cc: <stable(a)vger.kernel.org> Signed-off-by: Mike Kravetz <mike.kravetz(a)oracle.com> --- mm/hugetlb.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index d029d938d26d..8713f8ef0f4c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4106,10 +4106,30 @@ static vm_fault_t hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma, * may get SIGKILLed if it later faults. */ if (outside_reserve) { + struct address_space *mapping = vma->vm_file->f_mapping; + pgoff_t idx; + u32 hash; + put_page(old_page); BUG_ON(huge_pte_none(pte)); + /* + * Drop hugetlb_fault_mutex and i_mmap_rwsem before + * unmapping. unmapping needs to hold i_mmap_rwsem + * in write mode. Dropping i_mmap_rwsem in read mode + * here is OK as COW mappings do not interact with + * PMD sharing. + * + * Reacquire both after unmap operation. + */ + idx = vma_hugecache_offset(h, vma, haddr); + hash = hugetlb_fault_mutex_hash(mapping, idx); + mutex_unlock(&hugetlb_fault_mutex_table[hash]); + i_mmap_unlock_read(vma->vm_file->f_mapping); + unmap_ref_private(mm, vma, old_page, haddr); - BUG_ON(huge_pte_none(pte)); + + i_mmap_lock_read(vma->vm_file->f_mapping); + mutex_lock(&hugetlb_fault_mutex_table[hash]); spin_lock(ptl); ptep = huge_pte_offset(mm, haddr, huge_page_size(h)); if (likely(ptep && -- 2.29.2

4 years, 8 months

1
1
0 0

[PATCH] drm/i915: Fix mismatch between misplaced vma check and vma insert

by Chris Wilson

When inserting a VMA, we restrict the placement to the low 4G unless the caller opts into using the full range. This was done to allow usersapce the opportunity to transition slowly from a 32b address space, and to avoid breaking inherent 32b assumptions of some commands. However, for insert we limited ourselves to 4G-4K, but on verification we allowed the full 4G. This causes some attempts to bind a new buffer to sporadically fail with -ENOSPC, but at other times be bound successfully. commit 48ea1e32c39d ("drm/i915/gen9: Set PIN_ZONE_4G end to 4GB - 1 page") suggests that there is a genuine problem with stateless addressing that cannot utilize the last page in 4G and so we purposefully excluded it. Reported-by: CQ Tang <cq.tang(a)intel.com> Fixes: 48ea1e32c39d ("drm/i915/gen9: Set PIN_ZONE_4G end to 4GB - 1 page") Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: CQ Tang <cq.tang(a)intel.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 193996144c84..2ff32daa50bd 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -382,7 +382,7 @@ eb_vma_misplaced(const struct drm_i915_gem_exec_object2 *entry, return true; if (!(flags & EXEC_OBJECT_SUPPORTS_48B_ADDRESS) && - (vma->node.start + vma->node.size - 1) >> 32) + (vma->node.start + vma->node.size + 4095) >> 32) return true; if (flags & __EXEC_OBJECT_NEEDS_MAP && -- 2.20.1

4 years, 8 months

2
1
0 0

[PATCH 5.4 00/36] 5.4.84-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.84 release. There are 36 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 Wed, 16 Dec 2020 17:25:32 +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/v5.x/stable-review/patch-5.4.84-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.84-rc1 Arvind Sankar <nivedita(a)alum.mit.edu> compiler.h: fix barrier_data() on clang Minchan Kim <minchan(a)kernel.org> mm/zsmalloc.c: drop ZSMALLOC_PGTABLE_MAPPING Thomas Gleixner <tglx(a)linutronix.de> x86/apic/vector: Fix ordering in vector assignment Andy Lutomirski <luto(a)kernel.org> x86/membarrier: Get rid of a dubious optimization Arvind Sankar <nivedita(a)alum.mit.edu> x86/mm/mem_encrypt: Fix definition of PMD_FLAGS_DEC_WP Dan Carpenter <dan.carpenter(a)oracle.com> scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" Miles Chen <miles.chen(a)mediatek.com> proc: use untagged_addr() for pagemap_read addresses Arnd Bergmann <arnd(a)arndb.de> kbuild: avoid static_assert for genksyms Manasi Navare <manasi.d.navare(a)intel.com> drm/i915/display/dp: Compute the correct slice count for VDSC on DP Bean Huo <beanhuo(a)micron.com> mmc: block: Fixup condition for CMD13 polling for RPMB requests Coiby Xu <coiby.xu(a)gmail.com> pinctrl: amd: remove debounce filter setting in IRQ type setting Chris Chiu <chiu(a)endlessos.org> Input: i8042 - add Acer laptops to the i8042 reset list Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Input: cm109 - do not stomp on control URB Libo Chen <libo.chen(a)oracle.com> ktest.pl: Fix incorrect reboot for grub2bls Pankaj Sharma <pankj.sharma(a)samsung.com> can: m_can: m_can_dev_setup(): add support for bosch mcan version 3.3.0 Hans de Goede <hdegoede(a)redhat.com> platform/x86: touchscreen_dmi: Add info for the Irbis TW118 tablet Max Verevkin <me(a)maxverevkin.tk> platform/x86: intel-vbtn: Support for tablet mode on HP Pavilion 13 x360 PC Timo Witte <timo.witte(a)gmail.com> platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE Hans de Goede <hdegoede(a)redhat.com> platform/x86: thinkpad_acpi: Add BAT1 is primary battery quirk for Thinkpad Yoga 11e 4th gen Hans de Goede <hdegoede(a)redhat.com> platform/x86: thinkpad_acpi: Do not report SW_TABLET_MODE on Yoga 11e Jon Hunter <jonathanh(a)nvidia.com> arm64: tegra: Disable the ACONNECT for Jetson TX2 Hao Si <si.hao(a)zte.com.cn> soc: fsl: dpio: Get the cpumask through cpumask_of(cpu) Ran Wang <ran.wang_1(a)nxp.com> spi: spi-nxp-fspi: fix fspi panic by unexpected interrupts Xu Qiang <xuqiang36(a)huawei.com> irqchip/gic-v3-its: Unconditionally save/restore the ITS state on suspend Lijun Pan <ljp(a)linux.ibm.com> ibmvnic: skip tx timeout reset while in resetting Georgi Djakov <georgi.djakov(a)linaro.org> interconnect: qcom: qcs404: Remove GPU and display RPM IDs Can Guo <cang(a)codeaurora.org> scsi: ufs: Make sure clk scaling happens only when HBA is runtime ACTIVE Vineet Gupta <vgupta(a)synopsys.com> ARC: stack unwinding: don't assume non-current task is sleeping Zhen Lei <thunder.leizhen(a)huawei.com> arm64: dts: broadcom: clear the warnings caused by empty dma-ranges Michael Ellerman <mpe(a)ellerman.id.au> powerpc: Drop -me200 addition to build flags Sara Sharon <sara.sharon(a)intel.com> iwlwifi: mvm: fix kernel panic in case of assert during CSA Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: set LTR to avoid completion timeout Markus Reichl <m.reichl(a)fivetechno.de> arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: limit memory read spin time Fangrui Song <maskray(a)google.com> x86/lib: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S Nick Desaulniers <ndesaulniers(a)google.com> Kbuild: do not emit debug info for assembly with LLVM_IAS=1 ------------- Diffstat: Makefile | 7 +++- arch/arc/kernel/stacktrace.c | 23 +++++++---- .../boot/dts/broadcom/stingray/stingray-usb.dtsi | 20 +++++----- arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 12 ------ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 ++ arch/powerpc/Makefile | 1 - arch/x86/include/asm/pgtable_types.h | 1 + arch/x86/include/asm/sync_core.h | 9 +++-- arch/x86/kernel/apic/vector.c | 24 ++++++----- arch/x86/lib/memcpy_64.S | 4 +- arch/x86/lib/memmove_64.S | 4 +- arch/x86/lib/memset_64.S | 4 +- arch/x86/mm/mem_encrypt_identity.c | 4 +- arch/x86/mm/tlb.c | 10 ++++- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/input/misc/cm109.c | 7 +++- drivers/input/serio/i8042-x86ia64io.h | 42 ++++++++++++++++++++ drivers/interconnect/qcom/qcs404.c | 4 +- drivers/irqchip/irq-gic-v3-its.c | 16 ++------ drivers/mmc/core/block.c | 2 +- drivers/net/can/m_can/m_can.c | 2 + drivers/net/ethernet/ibm/ibmvnic.c | 6 +++ drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 10 +++++ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 20 ++++++++++ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 36 ++++++++++++----- drivers/pinctrl/pinctrl-amd.c | 7 ---- drivers/platform/x86/acer-wmi.c | 1 + drivers/platform/x86/intel-vbtn.c | 6 +++ drivers/platform/x86/thinkpad_acpi.c | 10 ++++- drivers/platform/x86/touchscreen_dmi.c | 23 +++++++++++ drivers/scsi/be2iscsi/be_main.c | 4 +- drivers/scsi/ufs/ufshcd.c | 7 ++++ drivers/soc/fsl/dpio/dpio-driver.c | 5 +-- drivers/spi/spi-nxp-fspi.c | 7 ++++ fs/proc/task_mmu.c | 8 +++- include/linux/build_bug.h | 5 +++ include/linux/compiler-clang.h | 6 --- include/linux/compiler-gcc.h | 19 --------- include/linux/compiler.h | 18 ++++++++- include/linux/zsmalloc.h | 1 - mm/Kconfig | 13 ------ mm/zsmalloc.c | 46 ---------------------- tools/testing/ktest/ktest.pl | 2 +- 44 files changed, 270 insertions(+), 193 deletions(-)

4 years, 8 months

5
40
0 0

[PATCH v2] btrfs: fix possible free space tree corruption with online conversion

by Josef Bacik

While running btrfs/011 in a loop I would often ASSERT() while trying to add a new free space entry that already existed, or get an -EEXIST while adding a new block to the extent tree, which is another indication of double allocation. This occurs because when we do the free space tree population, we create the new root and then populate the tree and commit the transaction. The problem is when you create a new root, the root node and commit root node are the same. This means that caching a block group before the transaction is committed can race with other operations modifying the free space tree, and thus you can get double adds and other sort of shenanigans. This is only a problem for the first transaction, once we've committed the transaction we created the free space tree in we're OK to use the free space tree to cache block groups. Fix this by marking the fs_info as unsafe to load the free space tree, and fall back on the old slow method. We could be smarter than this, for example caching the block group while we're populating the free space tree, but since this is a serious problem I've opted for the simplest solution. cc: stable(a)vger.kernel.org Fixes: a5ed91828518 ("Btrfs: implement the free space B-tree") Signed-off-by: Josef Bacik <josef(a)toxicpanda.com> --- fs/btrfs/block-group.c | 11 ++++++++++- fs/btrfs/ctree.h | 3 +++ fs/btrfs/free-space-tree.c | 10 +++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index 52f2198d44c9..b8bbdd95743e 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -673,7 +673,16 @@ static noinline void caching_thread(struct btrfs_work *work) wake_up(&caching_ctl->wait); } - if (btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE)) + /* + * If we are in the transaction that populated the free space tree we + * can't actually cache from the free space tree as our commit root and + * real root are the same, so we could change the contents of the blocks + * while caching. Instead do the slow caching in this case, and after + * the transaction has committed we will be safe. + */ + if (btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE) && + !(test_bit(BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, + &fs_info->flags))) ret = load_free_space_tree(caching_ctl); else ret = load_extent_tree_free(caching_ctl); diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 3935d297d198..4a60d81da5cb 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -562,6 +562,9 @@ enum { /* Indicate that we need to cleanup space cache v1 */ BTRFS_FS_CLEANUP_SPACE_CACHE_V1, + + /* Indicate that we can't trust the free space tree for caching yet. */ + BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, }; /* diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c index e33a65bd9a0c..a33bca94d133 100644 --- a/fs/btrfs/free-space-tree.c +++ b/fs/btrfs/free-space-tree.c @@ -1150,6 +1150,7 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info) return PTR_ERR(trans); set_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags); + set_bit(BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, &fs_info->flags); free_space_root = btrfs_create_tree(trans, BTRFS_FREE_SPACE_TREE_OBJECTID); if (IS_ERR(free_space_root)) { @@ -1171,11 +1172,18 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info) btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE); btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE_VALID); clear_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags); + ret = btrfs_commit_transaction(trans); - return btrfs_commit_transaction(trans); + /* + * Now that we've committed the transaction any reading of our commit + * root will be safe, so we can cache from the free space tree now. + */ + clear_bit(BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, &fs_info->flags); + return ret; abort: clear_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags); + clear_bit(BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, &fs_info->flags); btrfs_abort_transaction(trans, ret); btrfs_end_transaction(trans); return ret; -- 2.26.2

4 years, 8 months

3
2
0 0

[PATCH] USB: yurex: fix control-URB timeout handling

by Johan Hovold

Make sure to always cancel the control URB in write() so that it can be reused after a timeout or spurious CMD_ACK. Currently any further write requests after a timeout would fail after triggering a WARN() in usb_submit_urb() when attempting to submit the already active URB. Reported-by: syzbot+e87ebe0f7913f71f2ea5(a)syzkaller.appspotmail.com Fixes: 6bc235a2e24a ("USB: add driver for Meywa-Denki & Kayac YUREX") Cc: stable <stable(a)vger.kernel.org> # 2.6.37 Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/usb/misc/yurex.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c index 73ebfa6e9715..c640f98d20c5 100644 --- a/drivers/usb/misc/yurex.c +++ b/drivers/usb/misc/yurex.c @@ -496,6 +496,9 @@ static ssize_t yurex_write(struct file *file, const char __user *user_buffer, timeout = schedule_timeout(YUREX_WRITE_TIMEOUT); finish_wait(&dev->waitq, &wait); + /* make sure URB is idle after timeout or (spurious) CMD_ACK */ + usb_kill_urb(dev->cntl_urb); + mutex_unlock(&dev->io_mutex); if (retval < 0) { -- 2.26.2

4 years, 8 months

3
7
0 0

stable-rc/queue/4.19 baseline: 64 runs, 6 regressions (v4.19.163-27-g777e215ff3fc)

by kernelci.org bot

stable-rc/queue/4.19 baseline: 64 runs, 6 regressions (v4.19.163-27-g777e215ff3fc) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+-----------------+----------+---------------------+------------ meson-gxl-s905x-khadas-vim | arm64 | lab-baylibre | gcc-8 | defconfig | 1 meson-gxm-q200 | arm64 | lab-baylibre | gcc-8 | defconfig | 2 qemu_arm-versatilepb | arm | lab-baylibre | gcc-8 | versatile_defconfig | 1 qemu_arm-versatilepb | arm | lab-cip | gcc-8 | versatile_defconfig | 1 qemu_arm-versatilepb | arm | lab-linaro-lkft | gcc-8 | versatile_defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F4.19/kernel/v4.19.16… Test: baseline Tree: stable-rc Branch: queue/4.19 Describe: v4.19.163-27-g777e215ff3fc URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 777e215ff3fcd69d71d9fd0192b9b4a889fcd675 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+-----------------+----------+---------------------+------------ meson-gxl-s905x-khadas-vim | arm64 | lab-baylibre | gcc-8 | defconfig | 1 Details: https://kernelci.org/test/plan/id/5fd82a8a58b4caceeec94ccc 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/queue-4.19/v4.19.163-27-g777e215ff3… HTML log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.163-27-g777e215ff3… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5fd82a8a58b4caceeec94ccd new failure (last pass: v4.19.163-16-g4065dd9e0ea73) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+-----------------+----------+---------------------+------------ meson-gxm-q200 | arm64 | lab-baylibre | gcc-8 | defconfig | 2 Details: https://kernelci.org/test/plan/id/5fd82a5ab42c8ef9a4c94cc7 Results: 3 PASS, 2 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/queue-4.19/v4.19.163-27-g777e215ff3… HTML log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.163-27-g777e215ff3… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.dmesg.alert: https://kernelci.org/test/case/id/5fd82a5ab42c8ef9a4c94ccb new failure (last pass: v4.19.163-16-g4065dd9e0ea73) 8 lines 2020-12-15 03:15:33.883000+00:00 kern :alert : Mem abort info: 2020-12-15 03:15:33.884000+00:00 kern :alert : ESR = 0x8600000d 2020-12-15 03:15:33.925000+00:00 kern :alert : Exception class = IABT (current EL), IL = 32 bits 2020-12-15 03:15:33.925000+00:00 kern :alert : SET = 0, FnV = 0 2020-12-15 03:15:33.925000+00:00 kern :alert : EA = 0, S1PTW = 0 2020-12-15 03:15:33.925000+00:00 kern :alert : swapper pgtable: 4k pages, 48-bit VAs, pgdp = (____ptrval____) 2020-12-15 03:15:33.926000+00:00 kern :alert : [ffff80007da8ad00] pgd=000000007fff7003, pud=0068000040000711 * baseline.dmesg.emerg: https://kernelci.org/test/case/id/5fd82a5ab42c8ef9a4c94ccc new failure (last pass: v4.19.163-16-g4065dd9e0ea73) 3 lines 2020-12-15 03:15:33.926000+00:00 kern :emerg : Process udevadm (pid: 1526, stack limit = 0x(____ptrval____)) 2020-12-15 03:15:33.956000+00:00 kern :emerg : Code: 00000000 00000000 00000000 00000000 (704eb088) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+-----------------+----------+---------------------+------------ qemu_arm-versatilepb | arm | lab-baylibre | gcc-8 | versatile_defconfig | 1 Details: https://kernelci.org/test/plan/id/5fd82a9f7301f49bdbc94cc7 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: versatile_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.163-27-g777e215ff3… HTML log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.163-27-g777e215ff3… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5fd82a9f7301f49bdbc94cc8 failing since 31 days (last pass: v4.19.157-26-gd59f3161b3a0, first fail: v4.19.157-27-g5543cc2c41d55) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+-----------------+----------+---------------------+------------ qemu_arm-versatilepb | arm | lab-cip | gcc-8 | versatile_defconfig | 1 Details: https://kernelci.org/test/plan/id/5fd82aad7c027279d3c94cc1 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: versatile_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.163-27-g777e215ff3… HTML log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.163-27-g777e215ff3… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5fd82aae7c027279d3c94cc2 failing since 31 days (last pass: v4.19.157-26-gd59f3161b3a0, first fail: v4.19.157-27-g5543cc2c41d55) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+-----------------+----------+---------------------+------------ qemu_arm-versatilepb | arm | lab-linaro-lkft | gcc-8 | versatile_defconfig | 1 Details: https://kernelci.org/test/plan/id/5fd86282202cc8a7f5c94cc4 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: versatile_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.163-27-g777e215ff3… HTML log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.163-27-g777e215ff3… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5fd86282202cc8a7f5c94cc5 failing since 31 days (last pass: v4.19.157-26-gd59f3161b3a0, first fail: v4.19.157-27-g5543cc2c41d55)

4 years, 8 months

1
0
0 0

[PATCH AliOS 4.19 v3 11/15] KEYS: trusted: allow module init if TPM is inactive or deactivated

by Shan

From: Roberto Sassu <roberto.sassu(a)huawei.com> commit 2d6c25215ab26bb009de3575faab7b685f138e92 upstream. Commit c78719203fc6 ("KEYS: trusted: allow trusted.ko to initialize w/o a TPM") allows the trusted module to be loaded even if a TPM is not found, to avoid module dependency problems. However, trusted module initialization can still fail if the TPM is inactive or deactivated. tpm_get_random() returns an error. This patch removes the call to tpm_get_random() and instead extends the PCR specified by the user with zeros. The security of this alternative is equivalent to the previous one, as either option prevents with a PCR update unsealing and misuse of sealed data by a user space process. Even if a PCR is extended with zeros, instead of random data, it is still computationally infeasible to find a value as input for a new PCR extend operation, to obtain again the PCR value that would allow unsealing. Cc: stable(a)vger.kernel.org Fixes: 240730437deb ("KEYS: trusted: explicitly use tpm_chip structure...") Signed-off-by: Roberto Sassu <roberto.sassu(a)huawei.com> Reviewed-by: Tyler Hicks <tyhicks(a)canonical.com> Suggested-by: Mimi Zohar <zohar(a)linux.ibm.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> Signed-off-by: mayuanchen <mayuanchen(a)hygon.cn> Change-Id: Iada0e052c2ab4a0fbc2db4ac2690da3115d985c6 Signed-off-by: Shan <chenshan(a)hygon.cn> --- security/keys/trusted.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/security/keys/trusted.c b/security/keys/trusted.c index 5e983eb9a..b03525d0f 100644 --- a/security/keys/trusted.c +++ b/security/keys/trusted.c @@ -1216,24 +1216,11 @@ static int __init trusted_shash_alloc(void) static int __init init_digests(void) { - u8 digest[TPM_MAX_DIGEST_SIZE]; - int ret; - int i; - - ret = tpm_get_random(chip, digest, TPM_MAX_DIGEST_SIZE); - if (ret < 0) - return ret; - if (ret < TPM_MAX_DIGEST_SIZE) - return -EFAULT; - digests = kcalloc(chip->nr_allocated_banks, sizeof(*digests), GFP_KERNEL); if (!digests) return -ENOMEM; - for (i = 0; i < chip->nr_allocated_banks; i++) - memcpy(digests[i].digest, digest, TPM_MAX_DIGEST_SIZE); - return 0; } -- 2.17.1

4 years, 8 months

3
2
0 0

[PATCH AliOS 4.19 v3 12/15] KEYS: trusted: correctly initialize digests and fix locking issue

by Shan

From: Roberto Sassu <roberto.sassu(a)huawei.com> commit 9f75c82246313d4c2a6bc77e947b45655b3b5ad5 upstream. Commit 0b6cf6b97b7e ("tpm: pass an array of tpm_extend_digest structures to tpm_pcr_extend()") modifies tpm_pcr_extend() to accept a digest for each PCR bank. After modification, tpm_pcr_extend() expects that digests are passed in the same order as the algorithms set in chip->allocated_banks. This patch fixes two issues introduced in the last iterations of the patch set: missing initialization of the TPM algorithm ID in the tpm_digest structures passed to tpm_pcr_extend() by the trusted key module, and unreleased locks in the TPM driver due to returning from tpm_pcr_extend() without calling tpm_put_ops(). Cc: stable(a)vger.kernel.org Fixes: 0b6cf6b97b7e ("tpm: pass an array of tpm_extend_digest structures to tpm_pcr_extend()") Signed-off-by: Roberto Sassu <roberto.sassu(a)huawei.com> Suggested-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> Reviewed-by: Jerry Snitselaar <jsnitsel(a)redhat.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> Signed-off-by: mayuanchen <mayuanchen(a)hygon.cn> Change-Id: If1f7d414bcf2d8189d07623fea04d0b5db7060d8 Signed-off-by: Shan <chenshan(a)hygon.cn> --- drivers/char/tpm/tpm-interface.c | 14 +++++++++----- security/keys/trusted.c | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 46e0882d6..d0303d298 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -1057,18 +1057,22 @@ int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, if (!chip) return -ENODEV; - for (i = 0; i < chip->nr_allocated_banks; i++) - if (digests[i].alg_id != chip->allocated_banks[i].alg_id) - return -EINVAL; + for (i = 0; i < chip->nr_allocated_banks; i++) { + if (digests[i].alg_id != chip->allocated_banks[i].alg_id) { + rc = EINVAL; + goto out; + } + } if (chip->flags & TPM_CHIP_FLAG_TPM2) { rc = tpm2_pcr_extend(chip, pcr_idx, digests); - tpm_put_ops(chip); - return rc; + goto out; } rc = tpm1_pcr_extend(chip, pcr_idx, digests[0].digest, "attempting extend a PCR value"); + +out: tpm_put_ops(chip); return rc; } diff --git a/security/keys/trusted.c b/security/keys/trusted.c index b03525d0f..536970168 100644 --- a/security/keys/trusted.c +++ b/security/keys/trusted.c @@ -1216,11 +1216,16 @@ static int __init trusted_shash_alloc(void) static int __init init_digests(void) { + int i; + digests = kcalloc(chip->nr_allocated_banks, sizeof(*digests), GFP_KERNEL); if (!digests) return -ENOMEM; + for (i = 0; i < chip->nr_allocated_banks; i++) + digests[i].alg_id = chip->allocated_banks[i].alg_id; + return 0; } -- 2.17.1

4 years, 8 months

1
0
0 0

stable-rc/linux-5.4.y baseline: 143 runs, 5 regressions (v5.4.83-37-gfbaf54ae613a4)

by kernelci.org bot

stable-rc/linux-5.4.y baseline: 143 runs, 5 regressions (v5.4.83-37-gfbaf54ae613a4) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+-----------------+----------+---------------------+------------ hifive-unleashed-a00 | riscv | lab-baylibre | gcc-8 | defconfig | 1 meson-gxl-s905x-khadas-vim | arm64 | lab-baylibre | gcc-8 | defconfig | 1 qemu_arm-versatilepb | arm | lab-baylibre | gcc-8 | versatile_defconfig | 1 qemu_arm-versatilepb | arm | lab-cip | gcc-8 | versatile_defconfig | 1 qemu_arm-versatilepb | arm | lab-linaro-lkft | gcc-8 | versatile_defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/linux-5.4.y/kernel/v5.4.83-3… Test: baseline Tree: stable-rc Branch: linux-5.4.y Describe: v5.4.83-37-gfbaf54ae613a4 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: fbaf54ae613a47a62193642683ab9f23997aaa50 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+-----------------+----------+---------------------+------------ hifive-unleashed-a00 | riscv | lab-baylibre | gcc-8 | defconfig | 1 Details: https://kernelci.org/test/plan/id/5fd8307b253fa2be8ac94cca Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-8 (riscv64-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.83-37-gfbaf54ae613… HTML log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.83-37-gfbaf54ae613… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5fd8307b253fa2be8ac94ccb failing since 24 days (last pass: v5.4.77-152-ga3746663c3479, first fail: v5.4.78) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+-----------------+----------+---------------------+------------ meson-gxl-s905x-khadas-vim | arm64 | lab-baylibre | gcc-8 | defconfig | 1 Details: https://kernelci.org/test/plan/id/5fd82f244a4b4e0498c94cbc 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-5.4.y/v5.4.83-37-gfbaf54ae613… HTML log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.83-37-gfbaf54ae613… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5fd82f244a4b4e0498c94cbd new failure (last pass: v5.4.83) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+-----------------+----------+---------------------+------------ qemu_arm-versatilepb | arm | lab-baylibre | gcc-8 | versatile_defconfig | 1 Details: https://kernelci.org/test/plan/id/5fd8323f44dd43f448c94cc8 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: versatile_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.83-37-gfbaf54ae613… HTML log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.83-37-gfbaf54ae613… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5fd8323f44dd43f448c94cc9 failing since 30 days (last pass: v5.4.77-44-g28fe0e171c204, first fail: v5.4.77-46-ga3e34830d912) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+-----------------+----------+---------------------+------------ qemu_arm-versatilepb | arm | lab-cip | gcc-8 | versatile_defconfig | 1 Details: https://kernelci.org/test/plan/id/5fd8323e4c0a12a6f1c94cce Results: 0 PASS, 1 FAIL, 0 SKIP Full config: versatile_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.83-37-gfbaf54ae613… HTML log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.83-37-gfbaf54ae613… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5fd8323e4c0a12a6f1c94ccf failing since 30 days (last pass: v5.4.77-44-g28fe0e171c204, first fail: v5.4.77-46-ga3e34830d912) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+-----------------+----------+---------------------+------------ qemu_arm-versatilepb | arm | lab-linaro-lkft | gcc-8 | versatile_defconfig | 1 Details: https://kernelci.org/test/plan/id/5fd86374943612c764c94cb9 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: versatile_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.83-37-gfbaf54ae613… HTML log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.83-37-gfbaf54ae613… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5fd86374943612c764c94cba failing since 30 days (last pass: v5.4.77-44-g28fe0e171c204, first fail: v5.4.77-46-ga3e34830d912)

4 years, 8 months

1
0
0 0

stable-rc/linux-4.19.y baseline: 112 runs, 3 regressions (v4.19.163-28-ge89f25b970ae)

by kernelci.org bot

stable-rc/linux-4.19.y baseline: 112 runs, 3 regressions (v4.19.163-28-ge89f25b970ae) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions ---------------------+-------+--------------+----------+---------------------+------------ meson-gxm-q200 | arm64 | lab-baylibre | gcc-8 | defconfig | 1 qemu_arm-versatilepb | arm | lab-baylibre | gcc-8 | versatile_defconfig | 1 qemu_arm-versatilepb | arm | lab-cip | gcc-8 | versatile_defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/linux-4.19.y/kernel/v4.19.16… Test: baseline Tree: stable-rc Branch: linux-4.19.y Describe: v4.19.163-28-ge89f25b970ae URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: e89f25b970aebaadc2950ca4d4c76ab8114f25da Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions ---------------------+-------+--------------+----------+---------------------+------------ meson-gxm-q200 | arm64 | lab-baylibre | gcc-8 | defconfig | 1 Details: https://kernelci.org/test/plan/id/5fd82ca68cd6fb5979c94ce3 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.19.y/v4.19.163-28-ge89f25b9… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.163-28-ge89f25b9… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5fd82ca68cd6fb5979c94ce4 new failure (last pass: v4.19.163) platform | arch | lab | compiler | defconfig | regressions ---------------------+-------+--------------+----------+---------------------+------------ qemu_arm-versatilepb | arm | lab-baylibre | gcc-8 | versatile_defconfig | 1 Details: https://kernelci.org/test/plan/id/5fd82f29b010054432c94cc2 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: versatile_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-4.19.y/v4.19.163-28-ge89f25b9… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.163-28-ge89f25b9… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5fd82f29b010054432c94cc3 failing since 26 days (last pass: v4.19.157-26-ga8e7fec1fea1, first fail: v4.19.157-102-g1d674327c1b7) platform | arch | lab | compiler | defconfig | regressions ---------------------+-------+--------------+----------+---------------------+------------ qemu_arm-versatilepb | arm | lab-cip | gcc-8 | versatile_defconfig | 1 Details: https://kernelci.org/test/plan/id/5fd82f244a4b4e0498c94cb9 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: versatile_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-4.19.y/v4.19.163-28-ge89f25b9… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.163-28-ge89f25b9… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5fd82f244a4b4e0498c94cba failing since 26 days (last pass: v4.19.157-26-ga8e7fec1fea1, first fail: v4.19.157-102-g1d674327c1b7)

4 years, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror