1. 30 May, 2021 2 commits
    • Linus Torvalds's avatar
      Merge tag 'riscv-for-linus-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux · 9d68fe84
      Linus Torvalds authored
      Pull RISC-V fixes from Palmer Dabbelt:
       "A handful of RISC-V related fixes:
         - avoid errors when the stack tracing code is tracing itself.
         - resurrect the memtest= kernel command line argument on RISC-V,
           which was briefly enabled during the merge window before a
           refactoring disabled it.
         - build fix and some warning cleanups"
      * tag 'riscv-for-linus-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
        riscv: kexec: Fix W=1 build warnings
        riscv: kprobes: Fix build error when MMU=n
        riscv: Select ARCH_USE_MEMTEST
        riscv: stacktrace: fix the riscv stacktrace when CONFIG_FRAME_POINTER enabled
    • Linus Torvalds's avatar
      Merge tag 'xfs-5.13-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 75b9c727
      Linus Torvalds authored
      Pull xfs fixes from Darrick Wong:
       "This week's pile mitigates some decades-old problems in how extent
        size hints interact with realtime volumes, fixes some failures in
        online shrink, and fixes a problem where directory and symlink
        shrinking on extremely fragmented filesystems could fail.
        The most user-notable change here is to point users at our (new) IRC
        channel on OFTC. Freedom isn't free, it costs folks like you and me;
        and if you don't kowtow, they'll expel everyone and take over your
        channel. (Ok, ok, that didn't fit the song lyrics...)
         - Fix a bug where unmapping operations end earlier than expected,
           which can cause chaos on multi-block directory and symlink shrink
         - Fix an erroneous assert that can trigger if we try to transition a
           bmap structure from btree format to extents format with zero
           extents. This was exposed by xfs/538"
      * tag 'xfs-5.13-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: bunmapi has unnecessary AG lock ordering issues
        xfs: btree format inode forks can have zero extents
        xfs: add new IRC channel to MAINTAINERS
        xfs: validate extsz hints against rt extent size when rtinherit is set
        xfs: standardize extent size hint validation
        xfs: check free AG space when making per-AG reservations
  2. 29 May, 2021 15 commits
    • Linus Torvalds's avatar
      Merge tag 'thermal-v5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux · df8c66c4
      Linus Torvalds authored
      Pull thermal fixes from Daniel Lezcano:
       - Fix uninitialized error code value for the SPMI adc driver (Yang
       - Fix kernel doc warning (Yang Li)
       - Fix wrong read-write thermal trip point initialization (Srinivas
      * tag 'thermal-v5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
        thermal/drivers/qcom: Fix error code in adc_tm5_get_dt_channel_data()
        thermal/ti-soc-thermal: Fix kernel-doc
        thermal/drivers/intel: Initialize RW trip to THERMAL_TEMP_INVALID
    • Linus Torvalds's avatar
      Merge tag 'char-misc-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · f956cb99
      Linus Torvalds authored
      Pull char/misc driver fixes from Greg KH:
       "Here are some tiny char/misc driver fixes for 5.13-rc4.
        Nothing huge here, just some tiny fixes for reported issues:
         - two interconnect driver fixes
         - kgdb build warning fix for gcc-11
         - hgafb regression fix
         - soundwire driver fix
         - mei driver fix
        All have been in linux-next with no reported issues"
      * tag 'char-misc-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        mei: request autosuspend after sending rx flow control
        kgdb: fix gcc-11 warnings harder
        video: hgafb: correctly handle card detect failure during probe
        soundwire: qcom: fix handling of qcom,ports-block-pack-mode
        interconnect: qcom: Add missing MODULE_DEVICE_TABLE
        interconnect: qcom: bcm-voter: add a missing of_node_put()
    • Linus Torvalds's avatar
      Merge tag 'driver-core-5.13-rc4' of... · e1a9e3db
      Linus Torvalds authored
      Merge tag 'driver-core-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      Pull driver core fixes from Greg KH:
       "Here are three small driver core / debugfs fixes for 5.13-rc4:
         - debugfs fix for incorrect "lockdown" mode for selinux accesses
         - two device link changes, one bugfix and one cleanup
        All of these have been in linux-next for over a week with no reported
      * tag 'driver-core-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        drivers: base: Reduce device link removal code duplication
        drivers: base: Fix device link removal
        debugfs: fix security_locked_down() call for SELinux
    • Linus Torvalds's avatar
      Merge tag 'staging-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 494b99f7
      Linus Torvalds authored
      Pull staging and IIO driver fixes from Greg KH:
       "Here are some small IIO and staging driver fixes for reported issues
        for 5.13-rc4.
        Nothing major here, tiny changes for reported problems, full details
        are in the shortlog if people are curious.
        All have been in linux-next for a while with no reported problems"
      * tag 'staging-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        iio: adc: ad7793: Add missing error code in ad7793_setup()
        iio: adc: ad7923: Fix undersized rx buffer.
        iio: adc: ad7768-1: Fix too small buffer passed to iio_push_to_buffers_with_timestamp()
        iio: dac: ad5770r: Put fwnode in error case during ->probe()
        iio: gyro: fxas21002c: balance runtime power in error path
        staging: emxx_udc: fix loop in _nbu2ss_nuke()
        staging: iio: cdc: ad7746: avoid overwrite of num_channels
        iio: adc: ad7192: handle regulator voltage error first
        iio: adc: ad7192: Avoid disabling a clock that was never enabled.
        iio: adc: ad7124: Fix potential overflow due to non sequential channel numbers
        iio: adc: ad7124: Fix missbalanced regulator enable / disable on error.
    • Linus Torvalds's avatar
      Merge tag 'tty-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 3837f9a0
      Linus Torvalds authored
      Pull tty / serial driver fixes from Greg KH:
       "Here are some small fixes for reported problems for tty and serial
        drivers for 5.13-rc4.
        They consist of:
         - 8250 bugfixes and new device support
         - lockdown security mode fixup
         - syzbot found problems fixed
         - 8250_omap fix for interrupt storm
         - revert of 8250_omap driver fix as it caused worse problem than the
           original issue
        All but the last patch have been in linux-next for a while, the last
        one is a revert of a problem found in linux-next with the 8250_omap
        driver change"
      * tag 'tty-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        Revert "serial: 8250: 8250_omap: Fix possible interrupt storm"
        serial: 8250_pci: handle FL_NOIRQ board flag
        serial: rp2: use 'request_firmware' instead of 'request_firmware_nowait'
        serial: 8250_pci: Add support for new HPE serial device
        serial: 8250: 8250_omap: Fix possible interrupt storm
        serial: 8250: Use BIT(x) for UART_{CAP,BUG}_*
        serial: 8250: Add UART_BUG_TXRACE workaround for Aspeed VUART
        serial: 8250_dw: Add device HID for new AMD UART controller
        serial: sh-sci: Fix off-by-one error in FIFO threshold register setting
        serial: core: fix suspicious security_locked_down() call
        serial: tegra: Fix a mask operation that is always true
    • Linus Torvalds's avatar
      Merge tag 'usb-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 523d0b1e
      Linus Torvalds authored
      Pull USB / Thunderbolt fixes from Greg KH:
       "Here are a number of tiny USB and Thunderbolt driver fixes for
        They consist of:
         - thunderbolt fixes for some NVM bound issues
         - xhci fixes for reported problems
         - control-request fixups
         - documentation build warning fixes
         - new usb-serial driver device ids
         - typec bugfixes for reported issues
         - usbfs warning fixups (could be triggered from userspace)
         - other tiny fixes for reported problems.
        All of these have been in linux-next with no reported issues"
      * tag 'usb-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (22 commits)
        xhci: Fix 5.12 regression of missing xHC cache clearing command after a Stall
        xhci: fix giving back URB with incorrect status regression in 5.12
        usb: gadget: udc: renesas_usb3: Fix a race in usb3_start_pipen()
        usb: typec: tcpm: Respond Not_Supported if no snk_vdo
        usb: typec: tcpm: Properly interrupt VDM AMS
        USB: trancevibrator: fix control-request direction
        usb: Restore the usb_header label
        usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header
        usb: typec: ucsi: Clear pending after acking connector change
        usb: typec: mux: Fix matching with typec_altmode_desc
        misc/uss720: fix memory leak in uss720_probe
        usb: dwc3: gadget: Properly track pending and queued SG
        USB: usbfs: Don't WARN about excessively large memory allocations
        thunderbolt: usb4: Fix NVM read buffer bounds and offset issue
        thunderbolt: dma_port: Fix NVM read buffer bounds and offset issue
        usb: chipidea: udc: assign interrupt number to USB gadget structure
        usb: cdnsp: Fix lack of removing request from pending list.
        usb: cdns3: Fix runtime PM imbalance on error
        USB: serial: pl2303: add device id for ADLINK ND-6530 GC
        USB: serial: ti_usb_3410_5052: add startech.com device id
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 22447828
      Linus Torvalds authored
      Pull KVM fixes from Paolo Bonzini:
       "ARM fixes:
         - Another state update on exit to userspace fix
         - Prevent the creation of mixed 32/64 VMs
         - Fix regression with irqbypass not restarting the guest on failed
         - Fix regression with debug register decoding resulting in
           overlapping access
         - Commit exception state on exit to usrspace
         - Fix the MMU notifier return values
         - Add missing 'static' qualifiers in the new host stage-2 code
        x86 fixes:
         - fix guest missed wakeup with assigned devices
         - fix WARN reported by syzkaller
         - do not use BIT() in UAPI headers
         - make the kvm_amd.avic parameter bool
        PPC fixes:
         - make halt polling heuristics consistent with other architectures
         - various fixes
         - new performance selftest memslot_perf_test
         - test UFFD minor faults in demand_paging_test"
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (44 commits)
        selftests: kvm: fix overlapping addresses in memslot_perf_test
        KVM: X86: Kill off ctxt->ud
        KVM: X86: Fix warning caused by stale emulation context
        KVM: X86: Use kvm_get_linear_rip() in single-step and #DB/#BP interception
        KVM: x86/mmu: Fix comment mentioning skip_4k
        KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
        KVM: x86: add start_assignment hook to kvm_x86_ops
        KVM: LAPIC: Narrow the timer latency between wait_lapic_expire and world switch
        selftests: kvm: do only 1 memslot_perf_test run by default
        KVM: X86: Use _BITUL() macro in UAPI headers
        KVM: selftests: add shared hugetlbfs backing source type
        KVM: selftests: allow using UFFD minor faults for demand paging
        KVM: selftests: create alias mappings when using shared memory
        KVM: selftests: add shmem backing source type
        KVM: selftests: refactor vm_mem_backing_src_type flags
        KVM: selftests: allow different backing source types
        KVM: selftests: compute correct demand paging size
        KVM: selftests: simplify setup_demand_paging error handling
        KVM: selftests: Print a message if /dev/kvm is missing
    • Linus Torvalds's avatar
      Merge tag 's390-5.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 866c4b8a
      Linus Torvalds authored
      Pull s390 fixes from Vasily Gorbik:
       "Fix races in vfio-ccw request handling"
      * tag 's390-5.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        vfio-ccw: Serialize FSM IDLE state with I/O completion
        vfio-ccw: Reset FSM state to IDLE inside FSM
        vfio-ccw: Check initialized flag in cp_init()
    • Paolo Bonzini's avatar
      selftests: kvm: fix overlapping addresses in memslot_perf_test · 000ac429
      Paolo Bonzini authored
      vm_create allocates memory and maps it close to GPA.  This memory
      is separate from what is allocated in subsequent calls to
      vm_userspace_mem_region_add, so it is incorrect to pass the
      test memory size to vm_create_default.  Just pass a small
      fixed amount of memory which can be used later for page table,
      otherwise GPAs are already allocated at MEM_GPA and the
      test aborts.
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 6799d4f2
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "Ten small fixes, all in drivers"
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: target: qla2xxx: Wait for stop_phase1 at WWN removal
        scsi: hisi_sas: Drop free_irq() of devm_request_irq() allocated irq
        scsi: vmw_pvscsi: Set correct residual data length
        scsi: bnx2fc: Return failure if io_req is already in ABTS processing
        scsi: aic7xxx: Remove multiple definition of globals
        scsi: aic7xxx: Restore several defines for aic7xxx firmware build
        scsi: target: iblock: Fix smp_processor_id() BUG messages
        scsi: libsas: Use _safe() loop in sas_resume_port()
        scsi: target: tcmu: Fix xarray RCU warning
        scsi: target: core: Avoid smp_processor_id() in preemptible code
    • Linus Torvalds's avatar
      Merge tag 'block-5.13-2021-05-28' of git://git.kernel.dk/linux-block · 0217a27e
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       - NVMe pull request (Christoph):
            - fix a memory leak in nvme_cdev_add (Guoqing Jiang)
            - fix inline data size comparison in nvmet_tcp_queue_response (Hou
            - fix false keep-alive timeout when a controller is torn down
              (Sagi Grimberg)
            - fix a nvme-tcp Kconfig dependency (Sagi Grimberg)
            - short-circuit reconnect retries for FC (Hannes Reinecke)
            - decode host pathing error for connect (Hannes Reinecke)
       - MD pull request (Song):
            - Fix incorrect chunk boundary assert (Christoph)
       - Fix s390/dasd verification panic (Stefan)
      * tag 'block-5.13-2021-05-28' of git://git.kernel.dk/linux-block:
        nvmet: fix false keep-alive timeout when a controller is torn down
        nvmet-tcp: fix inline data size comparison in nvmet_tcp_queue_response
        nvme-tcp: remove incorrect Kconfig dep in BLK_DEV_NVME
        md/raid5: remove an incorrect assert in in_chunk_boundary
        s390/dasd: add missing discipline function
        nvme-fabrics: decode host pathing error for connect
        nvme-fc: short-circuit reconnect retries
        nvme: fix potential memory leaks in nvme_cdev_add
    • Linus Torvalds's avatar
      Merge tag 'io_uring-5.13-2021-05-28' of git://git.kernel.dk/linux-block · b3dbbae6
      Linus Torvalds authored
      Pull io_uring fixes from Jens Axboe:
       "A few minor fixes:
         - Fix an issue with hashed wait removal on exit (Zqiang, Pavel)
         - Fix a recent data race introduced in this series (Marco)"
      * tag 'io_uring-5.13-2021-05-28' of git://git.kernel.dk/linux-block:
        io_uring: fix data race to avoid potential NULL-deref
        io-wq: Fix UAF when wakeup wqe in hash waitqueue
        io_uring/io-wq: close io-wq full-stop gap
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-2021-05-29' of git://anongit.freedesktop.org/drm/drm · 567d1fd8
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Pretty quiet this week, couple of amdgpu, one i915, and a few misc otherwise.
         - prevent irrelevant swapout
         - MultiGPU fan fix
         - VCN powergating fixes
         - Fix SDMA register offset error
         - fix shutdown crash
         - Re-enable LTTPR non-transparent LT mode for DPCD_REV < 1.4"
      * tag 'drm-fixes-2021-05-29' of git://anongit.freedesktop.org/drm/drm:
        drm/ttm: Skip swapout if ttm object is not populated
        drm/i915: Reenable LTTPR non-transparent LT mode for DPCD_REV<1.4
        drm/meson: fix shutdown crash when component not probed
        drm/amdgpu/jpeg3: add cancel_delayed_work_sync before power gate
        drm/amdgpu/jpeg2.5: add cancel_delayed_work_sync before power gate
        drm/amdgpu/jpeg2.0: add cancel_delayed_work_sync before power gate
        drm/amdgpu/vcn3: add cancel_delayed_work_sync before power gate
        drm/amdgpu/vcn2.5: add cancel_delayed_work_sync before power gate
        drm/amdgpu/vcn2.0: add cancel_delayed_work_sync before power gate
        drm/amdgpu/vcn1: add cancel_delayed_work_sync before power gate
        drm/amdkfd: correct sienna_cichlid SDMA RLC register offset error
        drm/amd/pm: correct MGpuFanBoost setting
    • Linus Torvalds's avatar
      Merge tag 'perf-tools-fixes-for-v5.13-2021-05-28' of... · f289d990
      Linus Torvalds authored
      Merge tag 'perf-tools-fixes-for-v5.13-2021-05-28' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
      Pull perf tools fixes from Arnaldo Carvalho de Melo:
       - Fix error checking of BPF prog attachment in 'perf stat'.
       - Fix getting maximum number of fds in the vendor events JSON parser.
       - Move debug initialization earlier, fixing a segfault in some cases.
       - Fix eventcode of power10 JSON events.
      * tag 'perf-tools-fixes-for-v5.13-2021-05-28' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
        perf vendor events powerpc: Fix eventcode of power10 JSON events
        perf stat: Fix error check for bpf_program__attach
        perf debug: Move debug initialization earlier
        perf jevents: Fix getting maximum number of fds
    • Linus Torvalds's avatar
      Merge tag '5.13-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6 · 7c0ec89d
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "Three SMB3 fixes.
        Two for stable, and the other fixes a problem pointed out with a
        recently added ioctl"
      * tag '5.13-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: change format of CIFS_FULL_KEY_DUMP ioctl
        cifs: fix string declarations and assignments in tracepoints
        cifs: set server->cipher_type to AES-128-CCM for SMB3.0
  3. 28 May, 2021 13 commits
  4. 27 May, 2021 10 commits
    • Dave Airlie's avatar
      Merge tag 'amd-drm-fixes-5.13-2021-05-26' of... · ac6e9e3d
      Dave Airlie authored
      Merge tag 'amd-drm-fixes-5.13-2021-05-26' of https://gitlab.freedesktop.org/agd5f/linux
       into drm-fixes
      - MultiGPU fan fix
      - VCN powergating fixes
      - Fix SDMA register offset error
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      From: Alex Deucher <alexander.deucher@amd.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20210527031831.4057-1-alexander.deucher@amd.com
    • Linus Torvalds's avatar
      Merge branch 'for-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu · 97e5bf60
      Linus Torvalds authored
      Pull percpu fixes from Dennis Zhou:
       "This contains a cleanup to lib/percpu-refcount.c and an update to the
        MAINTAINERS file to more formally take over support for lib/percpu*"
      * 'for-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu:
        MAINTAINERS: Add lib/percpu* as part of percpu entry
        percpu_ref: Don't opencode percpu_ref_is_dying
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 3c856a31
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
       - Don't use contiguous or block mappings for the linear map when KFENCE
         is enabled.
       - Fix link in the arch_counter_enforce_ordering() comment.
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: mm: don't use CON and BLK mapping if KFENCE is enabled
        arm64: Fix stale link in the arch_counter_enforce_ordering() comment
    • Linus Torvalds's avatar
      Merge tag 'for-5.13/dm-fixes-2' of... · 38747c9a
      Linus Torvalds authored
      Merge tag 'for-5.13/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
      Pull device mapper fixes from Mike Snitzer:
       - Fix DM verity target's 'require_signatures' module_param permissions.
       - Revert DM snapshot fix from v5.13-rc3 and then properly fix crash
         when an origin has no snapshots. This allows only the proper fix to
         go to stable@ (since the original fix was successfully dropped).
      * tag 'for-5.13/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm snapshot: properly fix a crash when an origin has no snapshots
        dm snapshot: revert "fix a crash when an origin has no snapshots"
        dm verity: fix require_signatures module_param permissions
    • Aurelien Aptel's avatar
      cifs: change format of CIFS_FULL_KEY_DUMP ioctl · 1bb56810
      Aurelien Aptel authored
      Make CIFS_FULL_KEY_DUMP ioctl able to return variable-length keys.
      * userspace needs to pass the struct size along with optional
        session_id and some space at the end to store keys
      * if there is enough space kernel returns keys in the extra space and
        sets the length of each key via xyz_key_length fields
      This also fixes the build error for get_user() on ARM.
      Sample program:
      	#include <stdlib.h>
      	#include <stdio.h>
      	#include <stdint.h>
      	#include <sys/fcntl.h>
      	#include <sys/ioctl.h>
      	struct smb3_full_key_debug_info {
      	        uint32_t   in_size;
      	        uint64_t   session_id;
      	        uint16_t   cipher_type;
      	        uint8_t    session_key_length;
      	        uint8_t    server_in_key_length;
      	        uint8_t    server_out_key_length;
      	        uint8_t    data[];
      	         * return this struct with the keys appended at the end:
      	         * uint8_t session_key[session_key_length];
      	         * uint8_t server_in_key[server_in_key_length];
      	         * uint8_t server_out_key[server_out_key_length];
      	} __attribute__((packed));
      	#define CIFS_IOCTL_MAGIC 0xCF
      	#define CIFS_DUMP_FULL_KEY _IOWR(CIFS_IOCTL_MAGIC, 10, struct smb3_full_key_debug_info)
      	void dump(const void *p, size_t len) {
      	        const char *hex = "0123456789ABCDEF";
      	        const uint8_t *b = p;
      	        for (int i = 0; i < len; i++)
      	                printf("%c%c ", hex[(b[i]>>4)&0xf], hex[b[i]&0xf]);
      	int main(int argc, char **argv)
      	        struct smb3_full_key_debug_info *keys;
      	        uint8_t buf[sizeof(*keys)+1024] = {0};
      	        size_t off = 0;
      	        int fd, rc;
      	        keys = (struct smb3_full_key_debug_info *)&buf;
      	        keys->in_size = sizeof(buf);
      	        fd = open(argv[1], O_RDONLY);
      	        if (fd < 0)
      	                perror("open"), exit(1);
      	        rc = ioctl(fd, CIFS_DUMP_FULL_KEY, keys);
      	        if (rc < 0)
      	                perror("ioctl"), exit(1);
      	        printf("SessionId      ");
      	        dump(&keys->session_id, 8);
      	        printf("Cipher         %04x\n", keys->cipher_type);
      	        printf("SessionKey     ");
      	        dump(keys->data+off, keys->session_key_length);
      	        off += keys->session_key_length;
      	        printf("ServerIn Key   ");
      	        dump(keys->data+off, keys->server_in_key_length);
      	        off += keys->server_in_key_length;
      	        printf("ServerOut Key  ");
      	        dump(keys->data+off, keys->server_out_key_length);
      	        return 0;
      	$ gcc -o dumpkeys dumpkeys.c
      Against Windows Server 2020 preview (with AES-256-GCM support):
      	# mount.cifs //$ip/test /mnt -o "username=administrator,password=foo,vers=3.0,seal"
      	# ./dumpkeys /mnt/somefile
      	SessionId      0D 00 00 00 00 0C 00 00
      	Cipher         0002
      	SessionKey     AB CD CC 0D E4 15 05 0C 6F 3C 92 90 19 F3 0D 25
      	ServerIn Key   73 C6 6A C8 6B 08 CF A2 CB 8E A5 7D 10 D1 5B DC
      	ServerOut Key  6D 7E 2B A1 71 9D D7 2B 94 7B BA C4 F0 A5 A4 F8
      	# umount /mnt
      	With 256 bit keys:
      	# echo 1 > /sys/module/cifs/parameters/require_gcm_256
      	# mount.cifs //$ip/test /mnt -o "username=administrator,password=foo,vers=3.11,seal"
      	# ./dumpkeys /mnt/somefile
      	SessionId      09 00 00 00 00 0C 00 00
      	Cipher         0004
      	SessionKey     93 F5 82 3B 2F B7 2A 50 0B B9 BA 26 FB 8C 8B 03
      	ServerIn Key   6C 6A 89 B2 CB 7B 78 E8 04 93 37 DA 22 53 47 DF B3 2C 5F 02 26 70 43 DB 8D 33 7B DC 66 D3 75 A9
      	ServerOut Key  04 11 AA D7 52 C7 A8 0F ED E3 93 3A 65 FE 03 AD 3F 63 03 01 2B C0 1B D7 D7 E5 52 19 7F CC 46 B4
      Signed-off-by: default avatarAurelien Aptel <aaptel@suse.com>
      Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
      Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
    • Shyam Prasad N's avatar
      cifs: fix string declarations and assignments in tracepoints · eb068818
      Shyam Prasad N authored
      We missed using the variable length string macros in several
      tracepoints. Fixed them in this change.
      There's probably more useful macros that we can use to print
      others like flags etc. But I'll submit sepawrate patches for
      those at a future date.
      Signed-off-by: default avatarShyam Prasad N <sprasad@microsoft.com>
      Cc: <stable@vger.kernel.org> # v5.12
      Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
    • Aurelien Aptel's avatar
      cifs: set server->cipher_type to AES-128-CCM for SMB3.0 · 6d2fcfe6
      Aurelien Aptel authored
      SMB3.0 doesn't have encryption negotiate context but simply uses
      When that flag is present in the neg response cifs.ko uses AES-128-CCM
      which is the only cipher available in this context.
      cipher_type was set to the server cipher only when parsing encryption
      negotiate context (SMB3.1.1).
      For SMB3.0 it was set to 0. This means cipher_type value can be 0 or 1
      for AES-128-CCM.
      Fix this by checking for SMB3.0 and encryption capability and setting
      cipher_type appropriately.
      Signed-off-by: default avatarAurelien Aptel <aaptel@suse.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
    • Linus Torvalds's avatar
      Merge tag 'acpi-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 3224374f
      Linus Torvalds authored
      Pull ACPI fix from Rafael Wysocki:
       "Fix a recent ACPI power management regression causing boot issues to
        occur on some systems due to attempts to turn off ACPI power resources
        that are already off (which should work according to the ACPI
      * tag 'acpi-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: power: Refine turning off unused power resources
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 96c132f8
      Linus Torvalds authored
      Pull iommu fixes from Joerg Roedel:
       - Important fix for the AMD IOMMU driver in the recently added
         page-specific invalidation code to fix a calculation.
       - Fix a NULL-ptr dereference in the AMD IOMMU driver when a device
         switches domain types.
       - Fixes for the Intel VT-d driver to check for allocation failure and
         do correct cleanup.
       - Another fix for Intel VT-d to not allow supervisor page requests from
         devices when using second level page translation.
       - Add a MODULE_DEVICE_TABLE to the VIRTIO IOMMU driver
      * tag 'iommu-fixes-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/vt-d: Fix sysfs leak in alloc_iommu()
        iommu/vt-d: Use user privilege for RID2PASID translation
        iommu/vt-d: Check for allocation failure in aux_detach_device()
        iommu/virtio: Add missing MODULE_DEVICE_TABLE
        iommu/amd: Fix wrong parentheses on page-specific invalidations
        iommu/amd: Clear DMA ops when switching domain
    • Ian Rogers's avatar
      perf debug: Move debug initialization earlier · c59870e2
      Ian Rogers authored
      This avoids segfaults during option handlers that use pr_err. For
      example, "perf --debug nopager list" segfaults before this change.
      Fixes: 8abceacf
       (perf debug: Add debug_set_file function)
      Signed-off-by: default avatarIan Rogers <irogers@google.com>
      Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lore.kernel.org/lkml/20210519164447.2672030-1-irogers@google.com
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>