1. 08 Mar, 2022 8 commits
    • Linus Torvalds's avatar
      Merge tag 'devicetree-fixes-for-5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 4f86a6b4
      Linus Torvalds authored
      Pull devicetree fixes from Rob Herring:
      
       - Fix pinctrl node name warnings in examples
      
       - Add missing 'mux-states' property in ti,tcan104x-can binding
      
      * tag 'devicetree-fixes-for-5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        dt-bindings: phy: ti,tcan104x-can: Document mux-states property
        dt-bindings: mfd: Fix pinctrl node name warnings
      4f86a6b4
    • Linus Torvalds's avatar
      Merge tag 'fuse-fixes-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 92f90cc9
      Linus Torvalds authored
      Pull fuse fixes from Miklos Szeredi:
      
       - Fix an issue with splice on the fuse device
      
       - Fix a regression in the fileattr API conversion
      
       - Add a small userspace API improvement
      
      * tag 'fuse-fixes-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: fix pipe buffer lifetime for direct_io
        fuse: move FUSE_SUPER_MAGIC definition to magic.h
        fuse: fix fileattr op failure
      92f90cc9
    • Linus Torvalds's avatar
      Merge tag 'arm64-spectre-bhb-for-v5.17-2' of... · cd22a8bf
      Linus Torvalds authored
      Merge tag 'arm64-spectre-bhb-for-v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
      
      Pull arm64 spectre fixes from James Morse:
       "ARM64 Spectre-BHB mitigations:
      
         - Make EL1 vectors per-cpu
      
         - Add mitigation sequences to the EL1 and EL2 vectors on vulnerble
           CPUs
      
         - Implement ARCH_WORKAROUND_3 for KVM guests
      
         - Report Vulnerable when unprivileged eBPF is enabled"
      
      * tag 'arm64-spectre-bhb-for-v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: proton-pack: Include unprivileged eBPF status in Spectre v2 mitigation reporting
        arm64: Use the clearbhb instruction in mitigations
        KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated
        arm64: Mitigate spectre style branch history side channels
        arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2
        arm64: Add percpu vectors for EL1
        arm64: entry: Add macro for reading symbol addresses from the trampoline
        arm64: entry: Add vectors that have the bhb mitigation sequences
        arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations
        arm64: entry: Allow the trampoline text to occupy multiple pages
        arm64: entry: Make the kpti trampoline's kpti sequence optional
        arm64: entry: Move trampoline macros out of ifdef'd section
        arm64: entry: Don't assume tramp_vectors is the start of the vectors
        arm64: entry: Allow tramp_alias to access symbols after the 4K boundary
        arm64: entry: Move the trampoline data page before the text page
        arm64: entry: Free up another register on kpti's tramp_exit path
        arm64: entry: Make the trampoline cleanup optional
        KVM: arm64: Allow indirect vectors to be used without SPECTRE_V3A
        arm64: spectre: Rename spectre_v4_patch_fw_mitigation_conduit
        arm64: entry.S: Add ventry overflow sanity checks
      cd22a8bf
    • Linus Torvalds's avatar
      Merge tag 'for-linus-bhb' of git://git.armlinux.org.uk/~rmk/linux-arm · fc55c23a
      Linus Torvalds authored
      Pull ARM spectre fixes from Russell King:
       "ARM Spectre BHB mitigations.
      
        These patches add Spectre BHB migitations for the following Arm CPUs
        to the 32-bit ARM kernels:
         - Cortex A15
         - Cortex A57
         - Cortex A72
         - Cortex A73
         - Cortex A75
         - Brahma B15
        for CVE-2022-23960"
      
      * tag 'for-linus-bhb' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: include unprivileged BPF status in Spectre V2 reporting
        ARM: Spectre-BHB workaround
        ARM: use LOADADDR() to get load address of sections
        ARM: early traps initialisation
        ARM: report Spectre v2 status through sysfs
      fc55c23a
    • Aswath Govindraju's avatar
      dt-bindings: phy: ti,tcan104x-can: Document mux-states property · f6eafa40
      Aswath Govindraju authored
      On some boards, for routing CAN signals from controller to transceivers,
      muxes might need to be set. This can be implemented using mux-states
      property. Therefore, document the same in the respective bindings.
      Signed-off-by: default avatarAswath Govindraju <a-govindraju@ti.com>
      Reviewed-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Link: https://lore.kernel.org/r/20211216041012.16892-2-a-govindraju@ti.com
      f6eafa40
    • Rob Herring's avatar
      dt-bindings: mfd: Fix pinctrl node name warnings · 7e807f4b
      Rob Herring authored
      The recent addition pinctrl.yaml in commit c09acbc4 ("dt-bindings:
      pinctrl: use pinctrl.yaml") resulted in some node name warnings:
      
      Documentation/devicetree/bindings/mfd/cirrus,lochnagar.example.dt.yaml: \
       lochnagar-pinctrl: $nodename:0: 'lochnagar-pinctrl' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'
      Documentation/devicetree/bindings/mfd/cirrus,madera.example.dt.yaml: \
       codec@1a: $nodename:0: 'codec@1a' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'
      Documentation/devicetree/bindings/mfd/brcm,cru.example.dt.yaml: \
       pin-controller@1c0: $nodename:0: 'pin-controller@1c0' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'
      
      Fix the node names to the preferred 'pinctrl'. For cirrus,madera,
      nothing from pinctrl.yaml schema is used, so just drop the reference.
      
      Fixes: c09acbc4 ("dt-bindings: pinctrl: use pinctrl.yaml")
      Cc: Rafał Miłecki <rafal@milecki.pl>
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
      Acked-by: default avatarLee Jones <lee.jones@linaro.org>
      Link: https://lore.kernel.org/r/20220303232350.2591143-1-robh@kernel.org
      7e807f4b
    • Russell King (Oracle)'s avatar
      ARM: include unprivileged BPF status in Spectre V2 reporting · 25875aa7
      Russell King (Oracle) authored
      The mitigations for Spectre-BHB are only applied when an exception
      is taken, but when unprivileged BPF is enabled, userspace can
      load BPF programs that can be used to exploit the problem.
      
      When unprivileged BPF is enabled, report the vulnerable status via
      the spectre_v2 sysfs file.
      Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
      25875aa7
    • Linus Torvalds's avatar
      Merge tag 'x86_bugs_for_v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4a01e748
      Linus Torvalds authored
      Pull x86 spectre fixes from Borislav Petkov:
      
       - Mitigate Spectre v2-type Branch History Buffer attacks on machines
         which support eIBRS, i.e., the hardware-assisted speculation
         restriction after it has been shown that such machines are vulnerable
         even with the hardware mitigation.
      
       - Do not use the default LFENCE-based Spectre v2 mitigation on AMD as
         it is insufficient to mitigate such attacks. Instead, switch to
         retpolines on all AMD by default.
      
       - Update the docs and add some warnings for the obviously vulnerable
         cmdline configurations.
      
      * tag 'x86_bugs_for_v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/speculation: Warn about eIBRS + LFENCE + Unprivileged eBPF + SMT
        x86/speculation: Warn about Spectre v2 LFENCE mitigation
        x86/speculation: Update link to AMD speculation whitepaper
        x86/speculation: Use generic retpoline by default on AMD
        x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting
        Documentation/hw-vuln: Update spectre doc
        x86/speculation: Add eIBRS + Retpoline options
        x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE
      4a01e748
  2. 07 Mar, 2022 6 commits
    • Linus Torvalds's avatar
      Merge tag 'mtd/fixes-for-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux · ea4424be
      Linus Torvalds authored
      Pull MTD fix from Miquel Raynal:
       "As part of a previous changeset introducing support for the K3
        architecture, the OMAP_GPMC (a non visible symbol) got selected by the
        selection of MTD_NAND_OMAP2 instead of doing so from the architecture
        directly (like for the other users of these two drivers). Indeed, from
        a hardware perspective, the OMAP NAND controller needs the GPMC to
        work.
      
        This led to a robot error which got addressed in fix merge into -rc4.
        Unfortunately, the approach at this time still used "select" and lead
        to further build error reports (sparc64:allmodconfig).
      
        This time we switch to 'depends on' in order to prevent random
        misconfigurations. The different dependencies will however need a
        future cleanup"
      
      * tag 'mtd/fixes-for-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
        mtd: rawnand: omap2: Actually prevent invalid configuration and build error
      ea4424be
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 06be3029
      Linus Torvalds authored
      Pull virtio fixes from Michael Tsirkin:
       "Some last minute fixes that took a while to get ready. Not
        regressions, but they look safe and seem to be worth to have"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        tools/virtio: handle fallout from folio work
        tools/virtio: fix virtio_test execution
        vhost: remove avail_event arg from vhost_update_avail_event()
        virtio: drop default for virtio-mem
        vdpa: fix use-after-free on vp_vdpa_remove
        virtio-blk: Remove BUG_ON() in virtio_queue_rq()
        virtio-blk: Don't use MAX_DISCARD_SEGMENTS if max_discard_seg is zero
        vhost: fix hung thread due to erroneous iotlb entries
        vduse: Fix returning wrong type in vduse_domain_alloc_iova()
        vdpa/mlx5: add validation for VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET command
        vdpa/mlx5: should verify CTRL_VQ feature exists for MQ
        vdpa: factor out vdpa_set_features_unlocked for vdpa internal use
        virtio_console: break out of buf poll on remove
        virtio: document virtio_reset_device
        virtio: acknowledge all features before access
        virtio: unexport virtio_finalize_features
      06be3029
    • Halil Pasic's avatar
      swiotlb: rework "fix info leak with DMA_FROM_DEVICE" · aa6f8dcb
      Halil Pasic authored
      Unfortunately, we ended up merging an old version of the patch "fix info
      leak with DMA_FROM_DEVICE" instead of merging the latest one. Christoph
      (the swiotlb maintainer), he asked me to create an incremental fix
      (after I have pointed this out the mix up, and asked him for guidance).
      So here we go.
      
      The main differences between what we got and what was agreed are:
      * swiotlb_sync_single_for_device is also required to do an extra bounce
      * We decided not to introduce DMA_ATTR_OVERWRITE until we have exploiters
      * The implantation of DMA_ATTR_OVERWRITE is flawed: DMA_ATTR_OVERWRITE
        must take precedence over DMA_ATTR_SKIP_CPU_SYNC
      
      Thus this patch removes DMA_ATTR_OVERWRITE, and makes
      swiotlb_sync_single_for_device() bounce unconditionally (that is, also
      when dir == DMA_TO_DEVICE) in order do avoid synchronising back stale
      data from the swiotlb buffer.
      
      Let me note, that if the size used with dma_sync_* API is less than the
      size used with dma_[un]map_*, under certain circumstances we may still
      end up with swiotlb not being transparent. In that sense, this is no
      perfect fix either.
      
      To get this bullet proof, we would have to bounce the entire
      mapping/bounce buffer. For that we would have to figure out the starting
      address, and the size of the mapping in
      swiotlb_sync_single_for_device(). While this does seem possible, there
      seems to be no firm consensus on how things are supposed to work.
      Signed-off-by: default avatarHalil Pasic <pasic@linux.ibm.com>
      Fixes: ddbd89de ("swiotlb: fix info leak with DMA_FROM_DEVICE")
      Cc: stable@vger.kernel.org
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      aa6f8dcb
    • James Morse's avatar
      arm64: proton-pack: Include unprivileged eBPF status in Spectre v2 mitigation reporting · 58c9a506
      James Morse authored
      The mitigations for Spectre-BHB are only applied when an exception is
      taken from user-space. The mitigation status is reported via the spectre_v2
      sysfs vulnerabilities file.
      
      When unprivileged eBPF is enabled the mitigation in the exception vectors
      can be avoided by an eBPF program.
      
      When unprivileged eBPF is enabled, print a warning and report vulnerable
      via the sysfs vulnerabilities file.
      Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Signed-off-by: default avatarJames Morse <james.morse@arm.com>
      58c9a506
    • Roger Quadros's avatar
      mtd: rawnand: omap2: Actually prevent invalid configuration and build error · 42da5a4b
      Roger Quadros authored
      The root of the problem is that we are selecting symbols that have
      dependencies. This can cause random configurations that can fail.
      The cleanest solution is to avoid using select.
      
      This driver uses interfaces from the OMAP_GPMC driver so we have to
      depend on it instead.
      
      Fixes: 4cd335da ("mtd: rawnand: omap2: Prevent invalid configuration and build error")
      Signed-off-by: default avatarRoger Quadros <rogerq@kernel.org>
      Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
      Tested-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Link: https://lore.kernel.org/linux-mtd/20220219193600.24892-1-rogerq@kernel.org
      42da5a4b
    • Miklos Szeredi's avatar
      fuse: fix pipe buffer lifetime for direct_io · 0c4bcfde
      Miklos Szeredi authored
      In FOPEN_DIRECT_IO mode, fuse_file_write_iter() calls
      fuse_direct_write_iter(), which normally calls fuse_direct_io(), which then
      imports the write buffer with fuse_get_user_pages(), which uses
      iov_iter_get_pages() to grab references to userspace pages instead of
      actually copying memory.
      
      On the filesystem device side, these pages can then either be read to
      userspace (via fuse_dev_read()), or splice()d over into a pipe using
      fuse_dev_splice_read() as pipe buffers with &nosteal_pipe_buf_ops.
      
      This is wrong because after fuse_dev_do_read() unlocks the FUSE request,
      the userspace filesystem can mark the request as completed, causing write()
      to return. At that point, the userspace filesystem should no longer have
      access to the pipe buffer.
      
      Fix by copying pages coming from the user address space to new pipe
      buffers.
      Reported-by: default avatarJann Horn <jannh@google.com>
      Fixes: c3021629 ("fuse: support splice() reading from fuse device")
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
      0c4bcfde
  3. 06 Mar, 2022 13 commits
  4. 05 Mar, 2022 13 commits