1. 11 11月, 2022 2 次提交
    • L
      Merge tag 'phy-fixes-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy · 8395ee62
      Linus Torvalds 提交于
      Pull phy fixes from Vinod Koul:
       "A bunch of odd driver fixes and a MAINTAINER email update:
      
         - Update Kishon's email
      
         - stms32 error code fix in driver probe
      
         - tegra: fix for checking valid pointer
      
         - qcom_qmp: null deref fix
      
         - sunplus: error check fix
      
         - ralink: add missing sentinel to table"
      
      * tag 'phy-fixes-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
        phy: ralink: mt7621-pci: add sentinel to quirks table
        phy: sunplus: Fix an IS_ERR() vs NULL bug in sp_usb_phy_probe
        phy: qcom-qmp-combo: fix NULL-deref on runtime resume
        phy: tegra: xusb: Fix crash during pad power on/down
        phy: stm32: fix an error code in probe
        MAINTAINERS: Update Kishon's email address in GENERIC PHY FRAMEWORK
      8395ee62
    • L
      Merge tag 'hwlock-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux · 17922865
      Linus Torvalds 提交于
      Pull hwspinlock updates from Bjorn Andersson:
       "I apparently had missed tagging and sending this set of changes out
        during the 6.1 merge window. But did get the associated dts changes
        depending on this merged. The result is a regression in 6.1-rc on the
        affected, older, Qualcomm platforms - in for form of them not booting.
      
        So while these weren't regression fixes originally, they are now. It's
        not introducing new beahavior, but simply extending the existing new
        Devicetree model, to cover remaining platforms:
      
         - extend the DeviceTree binding and implementation for the Qualcomm
           hardware spinlock on some older platforms to follow the style of
           the newer ones where the DeviceTree representation does not rely on
           an intermediate syscon node"
      
      * tag 'hwlock-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
        dt-bindings: hwlock: qcom-hwspinlock: add syscon to MSM8974
        hwspinlock: qcom: add support for MMIO on older SoCs
        hwspinlock: qcom: correct MMIO max register for newer SoCs
        dt-bindings: hwlock: qcom-hwspinlock: correct example indentation
        dt-bindings: hwlock: qcom-hwspinlock: add support for MMIO on older SoCs
      17922865
  2. 10 11月, 2022 1 次提交
    • L
      Merge tag 'slab-for-6.1-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab · f67dd6ce
      Linus Torvalds 提交于
      Pull slab fixes from Vlastimil Babka:
       "Most are small fixups as described below.
      
        The !CONFIG_TRACING fix is a bit bigger and would normally be done in
        the next merge window as part of upcoming hardening changes. But we
        realized it can make the kmalloc waste tracking introduced in this
        window inaccurate, so decided to go with it now.
      
        Summary:
      
         - Remove !CONFIG_TRACING kmalloc() wrappers intended to save a
           function call, due to incompatilibity with recently introduced
           wasted space tracking and planned hardening changes.
      
         - A tracing parameter regression fix, by Kees Cook.
      
         - Two kernel-doc warning fixups, by Lukas Bulwahn and myself
      
      * tag 'slab-for-6.1-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab:
        mm, slab: remove duplicate kernel-doc comment for ksize()
        mm/slab_common: Restore passing "caller" for tracing
        mm/slab: remove !CONFIG_TRACING variants of kmalloc_[node_]trace()
        mm/slab_common: repair kernel-doc for __ksize()
      f67dd6ce
  3. 09 11月, 2022 2 次提交
    • L
      Merge tag 'audit-pr-20221107' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit · f141df37
      Linus Torvalds 提交于
      Pull audit fix from Paul Moore:
       "A small audit patch to fix an instance of undefined behavior in a
        shift operator caused when shifting a signed value too far, the same
        case as the lsm patch merged previously.
      
        While the fix is trivial and I can't imagine it causing a problem in a
        backport, I'm not explicitly marking it for stable on the off chance
        that there is some system out there which is relying on some wonky
        unexpected behavior which this patch could break; *if* it does break,
        IMO it's better that to happen in a minor or -rcX release and not in a
        stable backport"
      
      * tag 'audit-pr-20221107' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
        audit: fix undefined behavior in bit shift for AUDIT_BIT
      f141df37
    • L
      Merge tag 'lsm-pr-20221107' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm · f49b2d89
      Linus Torvalds 提交于
      Pull lsm fix from Paul Moore:
       "A small capability patch to fix an instance of undefined behavior in a
        shift operator caused when shifting a signed value too far.
      
        While the fix is trivial and I can't imagine it causing a problem in a
        backport, I'm not explicitly marking it for stable on the off chance
        that there is some system out there which is relying on some wonky
        unexpected behavior which this patch could break; *if* it does break,
        IMO it's better that to happen in a minor or -rcX release and not in a
        stable backport"
      
      * tag 'lsm-pr-20221107' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
        capabilities: fix undefined behavior in bit shift for CAP_TO_MASK
      f49b2d89
  4. 08 11月, 2022 3 次提交
    • L
      fs/userfaultfd: Fix maple tree iterator in userfaultfd_unregister() · 59f2f4b8
      Liam Howlett 提交于
      When iterating the VMAs, the maple state needs to be invalidated if the
      tree is modified by a split or merge to ensure the maple tree node
      contained in the maple state is still valid.  These invalidations were
      missed, so add them to the paths which alter the tree.
      
      Reported-by: syzbot+0d2014e4da2ccced5b41@syzkaller.appspotmail.com
      Fixes: 69dbe6da (userfaultfd: use maple tree iterator to iterate VMAs)
      Signed-off-by: NLiam R. Howlett <Liam.Howlett@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      59f2f4b8
    • L
      Merge tag 'platform-drivers-x86-v6.1-3' of... · a1de832b
      Linus Torvalds 提交于
      Merge tag 'platform-drivers-x86-v6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
      
      Pull x86 platform driver fixes from Hans de Goede:
       "The most important fixes here are a set of fixes for the ACPI
        backlight detection refactor which landed in 6.1.
      
        These fix regressions reported on some laptop models by making
        acpi_video_backlight_use_native() always return true for now, which in
        essence undoes some of the changes.
      
        I plan to take another shot at having only 1 /sys/class/backlight
        class device per panel with 6.2, with modified detection heuristics to
        avoid the (known) regressions.
      
        Highlights:
      
         - ACPI: video: Fix regressions from 6.1 backlight refactor by making
           acpi_video_backlight_use_native() always return true for now
      
         - Misc other bugfixes and HW id additions"
      
      * tag 'platform-drivers-x86-v6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
        platform/x86: p2sb: Don't fail if unknown CPU is found
        platform/x86/intel/hid: Add some ACPI device IDs
        platform/x86/intel/pmt: Sapphire Rapids PMT errata fix
        platform/x86: hp_wmi: Fix rfkill causing soft blocked wifi
        platform/x86: touchscreen_dmi: Add info for the RCA Cambio W101 v2 2-in-1
        platform/x86: ideapad-laptop: Disable touchpad_switch
        ACPI: video: Add backlight=native DMI quirk for Dell G15 5515
        ACPI: video: Make acpi_video_backlight_use_native() always return true
        ACPI: video: Improve Chromebook checks
      a1de832b
    • V
      mm, slab: remove duplicate kernel-doc comment for ksize() · c18c20f1
      Vlastimil Babka 提交于
      Akira reports:
      
      > "make htmldocs" reports duplicate C declaration of ksize() as follows:
      
      > /linux/Documentation/core-api/mm-api:43: ./mm/slab_common.c:1428: WARNING: Duplicate C declaration, also defined at core-api/mm-api:212.
      > Declaration is '.. c:function:: size_t ksize (const void *objp)'.
      
      > This is due to the kernel-doc comment for ksize() declaration added in
      > include/linux/slab.h by commit 05a94065 ("slab: Introduce
      > kmalloc_size_roundup()").
      
      There is an older kernel-doc comment for ksize() definition in
      mm/slab_common.c, which is not only duplicated, but also contradicts the
      new one - the additional storage discovered by ksize() should not be
      used by callers anymore. Delete the old kernel-doc.
      Reported-by: NAkira Yokosawa <akiyks@gmail.com>
      Link: https://lore.kernel.org/all/d33440f6-40cf-9747-3340-e54ffaf7afb8@gmail.com/
      Fixes: 05a94065 ("slab: Introduce kmalloc_size_roundup()")
      Cc: Kees Cook <keescook@chromium.org>
      Signed-off-by: NVlastimil Babka <vbabka@suse.cz>
      c18c20f1
  5. 07 11月, 2022 21 次提交
  6. 06 11月, 2022 9 次提交
    • P
      Merge tag 'kvmarm-fixes-6.1-3' of... · f4298cac
      Paolo Bonzini 提交于
      Merge tag 'kvmarm-fixes-6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
      
      * Fix the pKVM stage-1 walker erronously using the stage-2 accessor
      
      * Correctly convert vcpu->kvm to a hyp pointer when generating
        an exception in a nVHE+MTE configuration
      
      * Check that KVM_CAP_DIRTY_LOG_* are valid before enabling them
      
      * Fix SMPRI_EL1/TPIDR2_EL0 trapping on VHE
      
      * Document the boot requirements for FGT when entering the kernel
        at EL1
      f4298cac
    • P
      Merge branch 'kvm-master' into HEAD · 14620149
      Paolo Bonzini 提交于
      x86:
      * Use SRCU to protect zap in __kvm_set_or_clear_apicv_inhibit()
      
      * Make argument order consistent for kvcalloc()
      
      * Userspace API fixes for DEBUGCTL and LBRs
      14620149
    • T
      ext4: fix fortify warning in fs/ext4/fast_commit.c:1551 · 0d043351
      Theodore Ts'o 提交于
      With the new fortify string system, rework the memcpy to avoid this
      warning:
      
      memcpy: detected field-spanning write (size 60) of single field "&raw_inode->i_generation" at fs/ext4/fast_commit.c:1551 (size 4)
      
      Cc: stable@kernel.org
      Fixes: 54d9469b ("fortify: Add run-time WARN for cross-field memcpy()")
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      0d043351
    • J
      ext4: fix wrong return err in ext4_load_and_init_journal() · 9f2a1d9f
      Jason Yan 提交于
      The return value is wrong in ext4_load_and_init_journal(). The local
      variable 'err' need to be initialized before goto out. The original code
      in __ext4_fill_super() is fine because it has two return values 'ret'
      and 'err' and 'ret' is initialized as -EINVAL. After we factor out
      ext4_load_and_init_journal(), this code is broken. So fix it by directly
      returning -EINVAL in the error handler path.
      
      Cc: stable@kernel.org
      Fixes: 9c1dd22d ("ext4: factor out ext4_load_and_init_journal()")
      Signed-off-by: NJason Yan <yanaijie@huawei.com>
      Reviewed-by: NJan Kara <jack@suse.cz>
      Link: https://lore.kernel.org/r/20221025040206.3134773-1-yanaijie@huawei.comSigned-off-by: NTheodore Ts'o <tytso@mit.edu>
      9f2a1d9f
    • Y
      ext4: fix warning in 'ext4_da_release_space' · 1b8f787e
      Ye Bin 提交于
      Syzkaller report issue as follows:
      EXT4-fs (loop0): Free/Dirty block details
      EXT4-fs (loop0): free_blocks=0
      EXT4-fs (loop0): dirty_blocks=0
      EXT4-fs (loop0): Block reservation details
      EXT4-fs (loop0): i_reserved_data_blocks=0
      EXT4-fs warning (device loop0): ext4_da_release_space:1527: ext4_da_release_space: ino 18, to_free 1 with only 0 reserved data blocks
      ------------[ cut here ]------------
      WARNING: CPU: 0 PID: 92 at fs/ext4/inode.c:1528 ext4_da_release_space+0x25e/0x370 fs/ext4/inode.c:1524
      Modules linked in:
      CPU: 0 PID: 92 Comm: kworker/u4:4 Not tainted 6.0.0-syzkaller-09423-g493ffd66 #0
      Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/22/2022
      Workqueue: writeback wb_workfn (flush-7:0)
      RIP: 0010:ext4_da_release_space+0x25e/0x370 fs/ext4/inode.c:1528
      RSP: 0018:ffffc900015f6c90 EFLAGS: 00010296
      RAX: 42215896cd52ea00 RBX: 0000000000000000 RCX: 42215896cd52ea00
      RDX: 0000000000000000 RSI: 0000000080000001 RDI: 0000000000000000
      RBP: 1ffff1100e907d96 R08: ffffffff816aa79d R09: fffff520002bece5
      R10: fffff520002bece5 R11: 1ffff920002bece4 R12: ffff888021fd2000
      R13: ffff88807483ecb0 R14: 0000000000000001 R15: ffff88807483e740
      FS:  0000000000000000(0000) GS:ffff8880b9a00000(0000) knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      CR2: 00005555569ba628 CR3: 000000000c88e000 CR4: 00000000003506f0
      DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
      Call Trace:
       <TASK>
       ext4_es_remove_extent+0x1ab/0x260 fs/ext4/extents_status.c:1461
       mpage_release_unused_pages+0x24d/0xef0 fs/ext4/inode.c:1589
       ext4_writepages+0x12eb/0x3be0 fs/ext4/inode.c:2852
       do_writepages+0x3c3/0x680 mm/page-writeback.c:2469
       __writeback_single_inode+0xd1/0x670 fs/fs-writeback.c:1587
       writeback_sb_inodes+0xb3b/0x18f0 fs/fs-writeback.c:1870
       wb_writeback+0x41f/0x7b0 fs/fs-writeback.c:2044
       wb_do_writeback fs/fs-writeback.c:2187 [inline]
       wb_workfn+0x3cb/0xef0 fs/fs-writeback.c:2227
       process_one_work+0x877/0xdb0 kernel/workqueue.c:2289
       worker_thread+0xb14/0x1330 kernel/workqueue.c:2436
       kthread+0x266/0x300 kernel/kthread.c:376
       ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306
       </TASK>
      
      Above issue may happens as follows:
      ext4_da_write_begin
        ext4_create_inline_data
          ext4_clear_inode_flag(inode, EXT4_INODE_EXTENTS);
          ext4_set_inode_flag(inode, EXT4_INODE_INLINE_DATA);
      __ext4_ioctl
        ext4_ext_migrate -> will lead to eh->eh_entries not zero, and set extent flag
      ext4_da_write_begin
        ext4_da_convert_inline_data_to_extent
          ext4_da_write_inline_data_begin
            ext4_da_map_blocks
              ext4_insert_delayed_block
      	  if (!ext4_es_scan_clu(inode, &ext4_es_is_delonly, lblk))
      	    if (!ext4_es_scan_clu(inode, &ext4_es_is_mapped, lblk))
      	      ext4_clu_mapped(inode, EXT4_B2C(sbi, lblk)); -> will return 1
      	       allocated = true;
                ext4_es_insert_delayed_block(inode, lblk, allocated);
      ext4_writepages
        mpage_map_and_submit_extent(handle, &mpd, &give_up_on_write); -> return -ENOSPC
        mpage_release_unused_pages(&mpd, give_up_on_write); -> give_up_on_write == 1
          ext4_es_remove_extent
            ext4_da_release_space(inode, reserved);
              if (unlikely(to_free > ei->i_reserved_data_blocks))
      	  -> to_free == 1  but ei->i_reserved_data_blocks == 0
      	  -> then trigger warning as above
      
      To solve above issue, forbid inode do migrate which has inline data.
      
      Cc: stable@kernel.org
      Reported-by: syzbot+c740bb18df70ad00952e@syzkaller.appspotmail.com
      Signed-off-by: NYe Bin <yebin10@huawei.com>
      Reviewed-by: NJan Kara <jack@suse.cz>
      Link: https://lore.kernel.org/r/20221018022701.683489-1-yebin10@huawei.comSigned-off-by: NTheodore Ts'o <tytso@mit.edu>
      1b8f787e
    • L
      ext4: fix BUG_ON() when directory entry has invalid rec_len · 17a0bc9b
      Luís Henriques 提交于
      The rec_len field in the directory entry has to be a multiple of 4.  A
      corrupted filesystem image can be used to hit a BUG() in
      ext4_rec_len_to_disk(), called from make_indexed_dir().
      
       ------------[ cut here ]------------
       kernel BUG at fs/ext4/ext4.h:2413!
       ...
       RIP: 0010:make_indexed_dir+0x53f/0x5f0
       ...
       Call Trace:
        <TASK>
        ? add_dirent_to_buf+0x1b2/0x200
        ext4_add_entry+0x36e/0x480
        ext4_add_nondir+0x2b/0xc0
        ext4_create+0x163/0x200
        path_openat+0x635/0xe90
        do_filp_open+0xb4/0x160
        ? __create_object.isra.0+0x1de/0x3b0
        ? _raw_spin_unlock+0x12/0x30
        do_sys_openat2+0x91/0x150
        __x64_sys_open+0x6c/0xa0
        do_syscall_64+0x3c/0x80
        entry_SYSCALL_64_after_hwframe+0x46/0xb0
      
      The fix simply adds a call to ext4_check_dir_entry() to validate the
      directory entry, returning -EFSCORRUPTED if the entry is invalid.
      
      CC: stable@kernel.org
      Link: https://bugzilla.kernel.org/show_bug.cgi?id=216540Signed-off-by: NLuís Henriques <lhenriques@suse.de>
      Link: https://lore.kernel.org/r/20221012131330.32456-1-lhenriques@suse.deSigned-off-by: NTheodore Ts'o <tytso@mit.edu>
      17a0bc9b
    • L
      Merge tag 'acpi-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 2f5065a0
      Linus Torvalds 提交于
      Pull ACPI fix from Rafael Wysocki:
       "Add StorageD3Enable quirk for Dell Inspiron 16 5625 (Mario
        Limonciello)"
      
      * tag 'acpi-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: x86: Add another system to quirk list for forcing StorageD3Enable
      2f5065a0
    • R
      Merge branch 'acpi-x86' · 6faf4ce5
      Rafael J. Wysocki 提交于
      * acpi-x86:
        ACPI: x86: Add another system to quirk list for forcing StorageD3Enable
      6faf4ce5
    • L
      Merge tag 'block-6.1-2022-11-05' of git://git.kernel.dk/linux · 4869f575
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
      
       - Fixes for the ublk driver (Ming)
      
       - Fixes for error handling memory leaks (Chen Jun, Chen Zhongjin)
      
       - Explicitly clear the last request in a chain when the plug is
         flushed, as it may have already been issued (Al)
      
      * tag 'block-6.1-2022-11-05' of git://git.kernel.dk/linux:
        block: blk_add_rq_to_plug(): clear stale 'last' after flush
        blk-mq: Fix kmemleak in blk_mq_init_allocated_queue
        block: Fix possible memory leak for rq_wb on add_disk failure
        ublk_drv: add ublk_queue_cmd() for cleanup
        ublk_drv: avoid to touch io_uring cmd in blk_mq io path
        ublk_drv: comment on ublk_driver entry of Kconfig
        ublk_drv: return flag of UBLK_F_URING_CMD_COMP_IN_TASK in case of module
      4869f575
  7. 05 11月, 2022 2 次提交