1. 13 Dec, 2020 18 commits
    • Zhihao Cheng's avatar
      ubifs: Pass node length in all node dumping callers · a33e30a0
      Zhihao Cheng authored
      Function ubifs_dump_node() has been modified to avoid memory oob
      accessing while dumping node, node length (corresponding to the
      size of allocated memory for node) should be passed into all node
      dumping callers.
      Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      a33e30a0
    • Zhihao Cheng's avatar
      Revert "ubifs: Fix out-of-bounds memory access caused by abnormal value of node_len" · c8be0975
      Zhihao Cheng authored
      This reverts commit acc5af3e ("ubifs: Fix out-of-bounds memory access caused by abnormal value of node_len")
      
      No need to avoid memory oob in dumping for data node alone. Later, node
      length will be passed into function 'ubifs_dump_node()' which replaces
      all node dumping places.
      Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      c8be0975
    • Zhihao Cheng's avatar
      ubifs: Limit dumping length by size of memory which is allocated for the node · c4c0d19d
      Zhihao Cheng authored
      To prevent memory out-of-bounds accessing in ubifs_dump_node(), actual
      dumping length should be restricted by another condition(size of memory
      which is allocated for the node).
      
      This patch handles following situations (These situations may be caused
      by bit flipping due to hardware error, writing bypass ubifs, unknown
      bugs in ubifs, etc.):
      1. bad node_len: Dumping data according to 'ch->len' which may exceed
         the size of memory allocated for node.
      2. bad node content: Some kinds of node can record additional data, eg.
         index node and orphan node, make sure the size of additional data
         not beyond the node length.
      3. node_type changes: Read data according to type A, but expected type
         B, before that, node is allocated according to type B's size. Length
         of type A node is greater than type B node.
      Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      c4c0d19d
    • Chengsong Ke's avatar
      ubifs: Remove the redundant return in dbg_check_nondata_nodes_order · 32f6ccc7
      Chengsong Ke authored
      There is a redundant return in dbg_check_nondata_nodes_order,
      which will be never reached. In addition, error code should be
      returned instead of zero in this branch.
      Signed-off-by: default avatarChengsong Ke <kechengsong@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      32f6ccc7
    • Jamie Iles's avatar
      jffs2: Fix NULL pointer dereference in rp_size fs option parsing · a61df3c4
      Jamie Iles authored
      syzkaller found the following JFFS2 splat:
      
        Unable to handle kernel paging request at virtual address dfffa00000000001
        Mem abort info:
          ESR = 0x96000004
          EC = 0x25: DABT (current EL), IL = 32 bits
          SET = 0, FnV = 0
          EA = 0, S1PTW = 0
        Data abort info:
          ISV = 0, ISS = 0x00000004
          CM = 0, WnR = 0
        [dfffa00000000001] address between user and kernel address ranges
        Internal error: Oops: 96000004 [#1] SMP
        Dumping ftrace buffer:
           (ftrace buffer empty)
        Modules linked in:
        CPU: 0 PID: 12745 Comm: syz-executor.5 Tainted: G S                5.9.0-rc8+ #98
        Hardware name: linux,dummy-virt (DT)
        pstate: 20400005 (nzCv daif +PAN -UAO BTYPE=--)
        pc : jffs2_parse_param+0x138/0x308 fs/jffs2/super.c:206
        lr : jffs2_parse_param+0x108/0x308 fs/jffs2/super.c:205
        sp : ffff000022a57910
        x29: ffff000022a57910 x28: 0000000000000000
        x27: ffff000057634008 x26: 000000000000d800
        x25: 000000000000d800 x24: ffff0000271a9000
        x23: ffffa0001adb5dc0 x22: ffff000023fdcf00
        x21: 1fffe0000454af2c x20: ffff000024cc9400
        x19: 0000000000000000 x18: 0000000000000000
        x17: 0000000000000000 x16: ffffa000102dbdd0
        x15: 0000000000000000 x14: ffffa000109e44bc
        x13: ffffa00010a3a26c x12: ffff80000476e0b3
        x11: 1fffe0000476e0b2 x10: ffff80000476e0b2
        x9 : ffffa00010a3ad60 x8 : ffff000023b70593
        x7 : 0000000000000003 x6 : 00000000f1f1f1f1
        x5 : ffff000023fdcf00 x4 : 0000000000000002
        x3 : ffffa00010000000 x2 : 0000000000000001
        x1 : dfffa00000000000 x0 : 0000000000000008
        Call trace:
         jffs2_parse_param+0x138/0x308 fs/jffs2/super.c:206
         vfs_parse_fs_param+0x234/0x4e8 fs/fs_context.c:117
         vfs_parse_fs_string+0xe8/0x148 fs/fs_context.c:161
         generic_parse_monolithic+0x17c/0x208 fs/fs_context.c:201
         parse_monolithic_mount_data+0x7c/0xa8 fs/fs_context.c:649
         do_new_mount fs/namespace.c:2871 [inline]
         path_mount+0x548/0x1da8 fs/namespace.c:3192
         do_mount+0x124/0x138 fs/namespace.c:3205
         __do_sys_mount fs/namespace.c:3413 [inline]
         __se_sys_mount fs/namespace.c:3390 [inline]
         __arm64_sys_mount+0x164/0x238 fs/namespace.c:3390
         __invoke_syscall arch/arm64/kernel/syscall.c:36 [inline]
         invoke_syscall arch/arm64/kernel/syscall.c:48 [inline]
         el0_svc_common.constprop.0+0x15c/0x598 arch/arm64/kernel/syscall.c:149
         do_el0_svc+0x60/0x150 arch/arm64/kernel/syscall.c:195
         el0_svc+0x34/0xb0 arch/arm64/kernel/entry-common.c:226
         el0_sync_handler+0xc8/0x5b4 arch/arm64/kernel/entry-common.c:236
         el0_sync+0x15c/0x180 arch/arm64/kernel/entry.S:663
        Code: d2d40001 f2fbffe1 91002260 d343fc02 (38e16841)
        ---[ end trace 4edf690313deda44 ]---
      
      This is because since ec10a24f, the option parsing happens before
      fill_super and so the MTD device isn't associated with the filesystem.
      Defer the size check until there is a valid association.
      
      Fixes: ec10a24f ("vfs: Convert jffs2 to use the new mount API")
      Cc: <stable@vger.kernel.org>
      Cc: David Howells <dhowells@redhat.com>
      Signed-off-by: default avatarJamie Iles <jamie@nuviainc.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      a61df3c4
    • Fangping Liang's avatar
      ubifs: Fixed print foramt mismatch in ubifs · 89f40d0a
      Fangping Liang authored
      fs/ubifs/super.c: function mount_ubifs:
      the format specifier "lld" need arg type "long long",
      but the according arg "old_idx_sz" has type
      "unsigned long long"
      Signed-off-by: default avatarFangping Liang <liangfangping@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      89f40d0a
    • Pratyush Yadav's avatar
      ubi: Do not zero out EC and VID on ECC-ed NOR flashes · f669e74b
      Pratyush Yadav authored
      For NOR flashes EC and VID are zeroed out before an erase is issued to
      make sure UBI does not mistakenly treat the PEB as used and associate it
      with an LEB.
      
      But on some flashes, like the Cypress Semper S28 SPI NOR flash family,
      multi-pass page programming is not allowed on the default ECC scheme.
      This means zeroing out these magic numbers will result in the flash
      throwing a page programming error.
      
      Do not zero out EC and VID for such flashes. A writesize > 1 is an
      indication of an ECC-ed flash.
      Signed-off-by: default avatarPratyush Yadav <p.yadav@ti.com>
      Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      f669e74b
    • Tom Rix's avatar
      jffs2: remove trailing semicolon in macro definition · 22bdb8b6
      Tom Rix authored
      The macro use will already have a semicolon.
      Signed-off-by: default avatarTom Rix <trix@redhat.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      22bdb8b6
    • Wang ShaoBo's avatar
      ubifs: Fix error return code in ubifs_init_authentication() · 3cded663
      Wang ShaoBo authored
      Fix to return PTR_ERR() error code from the error handling case where
      ubifs_hash_get_desc() failed instead of 0 in ubifs_init_authentication(),
      as done elsewhere in this function.
      
      Fixes: 49525e5e ("ubifs: Add helper functions for authentication support")
      Signed-off-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
      Reviewed-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      3cded663
    • Richard Weinberger's avatar
      ubifs: wbuf: Don't leak kernel memory to flash · 20f14311
      Richard Weinberger authored
      Write buffers use a kmalloc()'ed buffer, they can leak
      up to seven bytes of kernel memory to flash if writes are not
      aligned.
      So use ubifs_pad() to fill these gaps with padding bytes.
      This was never a problem while scanning because the scanner logic
      manually aligns node lengths and skips over these gaps.
      
      Cc: <stable@vger.kernel.org>
      Fixes: 1e51764a ("UBIFS: add new flash file system")
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      Reviewed-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      20f14311
    • k00524021's avatar
      ubi: Remove useless code in bytes_str_to_int · 619ea229
      k00524021 authored
      As a local variable, "endp" is neither refered nor returned
      after this line "endp += 2", it looks like a useless code,
      suggest to remove it.
      Signed-off-by: default avatarChengsong Ke <kechengsong@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      619ea229
    • Chengsong Ke's avatar
      ubifs: Fix the printing type of c->big_lpt · f2124007
      Chengsong Ke authored
      Ubifs uses %d to print c->big_lpt, but c->big_lpt is a variable
      of type unsigned int and should be printed with %u.
      Signed-off-by: default avatarChengsong Ke <kechengsong@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      f2124007
    • lizhe's avatar
      jffs2: Allow setting rp_size to zero during remounting · cd3ed3c7
      lizhe authored
      Set rp_size to zero will be ignore during remounting.
      
      The method to identify whether we input a remounting option of
      rp_size is to check if the rp_size input is zero. It can not work
      well if we pass "rp_size=0".
      
      This patch add a bool variable "set_rp_size" to fix this problem.
      Reported-by: default avatarJubin Zhong <zhongjubin@huawei.com>
      Signed-off-by: default avatarlizhe <lizhe67@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      cd3ed3c7
    • lizhe's avatar
      jffs2: Fix ignoring mounting options problem during remounting · 08cd274f
      lizhe authored
      The jffs2 mount options will be ignored when remounting jffs2.
      It can be easily reproduced with the steps listed below.
      1. mount -t jffs2 -o compr=none /dev/mtdblockx /mnt
      2. mount -o remount compr=zlib /mnt
      
      Since ec10a24f, the option parsing happens before fill_super and
      then pass fc, which contains the options parsing results, to function
      jffs2_reconfigure during remounting. But function jffs2_reconfigure do
      not update c->mount_opts.
      
      This patch add a function jffs2_update_mount_opts to fix this problem.
      
      By the way, I notice that tmpfs use the same way to update remounting
      options. If it is necessary to unify them?
      
      Cc: <stable@vger.kernel.org>
      Fixes: ec10a24f ("vfs: Convert jffs2 to use the new mount API")
      Signed-off-by: default avatarlizhe <lizhe67@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      08cd274f
    • Zhe Li's avatar
      jffs2: Fix GC exit abnormally · 9afc9a8a
      Zhe Li authored
      The log of this problem is:
      jffs2: Error garbage collecting node at 0x***!
      jffs2: No space for garbage collection. Aborting GC thread
      
      This is because GC believe that it do nothing, so it abort.
      
      After going over the image of jffs2, I find a scene that
      can trigger this problem stably.
      The scene is: there is a normal dirent node at summary-area,
      but abnormal at corresponding not-summary-area with error
      name_crc.
      
      The reason that GC exit abnormally is because it find that
      abnormal dirent node to GC, but when it goes to function
      jffs2_add_fd_to_list, it cannot meet the condition listed
      below:
      
      if ((*prev)->nhash == new->nhash && !strcmp((*prev)->name, new->name))
      
      So no node is marked obsolete, statistical information of
      erase_block do not change, which cause GC exit abnormally.
      
      The root cause of this problem is: we do not check the
      name_crc of the abnormal dirent node with summary is enabled.
      
      Noticed that in function jffs2_scan_dirent_node, we use
      function jffs2_scan_dirty_space to deal with the dirent
      node with error name_crc. So this patch add a checking
      code in function read_direntry to ensure the correctness
      of dirent node. If checked failed, the dirent node will
      be marked obsolete so GC will pass this node and this
      problem will be fixed.
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarZhe Li <lizhe67@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      9afc9a8a
    • Chengguang Xu's avatar
      ubifs: Code cleanup by removing ifdef macro surrounding · 2976c19c
      Chengguang Xu authored
      Define ubifs_listxattr and ubifs_xattr_handlers to NULL
      when CONFIG_UBIFS_FS_XATTR is not enabled, then we can
      remove many ugly ifdef macros in the code.
      Signed-off-by: default avatarChengguang Xu <cgxu519@mykernel.net>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      2976c19c
    • Randy Dunlap's avatar
      jffs2: Fix if/else empty body warnings · 8fdaaf4c
      Randy Dunlap authored
      When debug (print) macros are not enabled, change them to use the
      no_printk() macro instead of <nothing>. This fixes gcc warnings when
      -Wextra is used:
      
      ../fs/jffs2/nodelist.c:255:37: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]
      ../fs/jffs2/nodelist.c:278:38: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]
      ../fs/jffs2/nodelist.c:558:52: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]
      ../fs/jffs2/xattr.c:1247:58: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
      ../fs/jffs2/xattr.c:1281:65: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
      
      Builds without warnings on all 3 levels of CONFIG_JFFS2_FS_DEBUG.
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Cc: Richard Weinberger <richard@nod.at>
      Cc: linux-mtd@lists.infradead.org
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      8fdaaf4c
    • Randy Dunlap's avatar
      ubifs: Delete duplicated words + other fixes · b8f1da98
      Randy Dunlap authored
      Delete repeated words in fs/ubifs/.
      {negative, is, of, and, one, it}
      where "it it" was changed to "if it".
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      To: linux-fsdevel@vger.kernel.org
      Cc: Richard Weinberger <richard@nod.at>
      Cc: linux-mtd@lists.infradead.org
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      b8f1da98
  2. 29 Nov, 2020 5 commits
  3. 28 Nov, 2020 5 commits
    • Linus Torvalds's avatar
      Merge tag 'riscv-for-linus-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux · aae5ab85
      Linus Torvalds authored
      Pull RISC-V fixes from Palmer Dabbelt:
       "I've collected a handful of fixes over the past few weeks:
      
         - A fix to un-break the build-id argument to the vDSO build, which is
           necessary for the LLVM linker.
      
         - A fix to initialize the jump label subsystem, without which it (and
           all the stuff that uses it) doesn't actually function.
      
         - A fix to include <asm/barrier.h> from <vdso/processor.h>, without
           which some drivers won't compile"
      
      * tag 'riscv-for-linus-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
        RISC-V: fix barrier() use in <vdso/processor.h>
        RISC-V: Add missing jump label initialization
        riscv: Explicitly specify the build id style in vDSO Makefile again
      aae5ab85
    • Linus Torvalds's avatar
      Merge tag 'kbuild-fixes-v5.10' of... · 45e885c4
      Linus Torvalds authored
      Merge tag 'kbuild-fixes-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
      
      Pull Kbuild fixes from Masahiro Yamada:
      
       - Remove unused OBJSIZE variable.
      
       - Fix rootless deb-pkg build in a setgid directory.
      
      * tag 'kbuild-fixes-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        builddeb: Fix rootless build in setuid/setgid directory
        kbuild: remove unused OBJSIZE
      45e885c4
    • Linus Torvalds's avatar
      Merge tag 'perf-tools-fixes-for-v5.10-2020-11-28' of... · ca579827
      Linus Torvalds authored
      Merge tag 'perf-tools-fixes-for-v5.10-2020-11-28' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
      
      Pull perf tool fixes from Arnaldo Carvalho de Melo:
      
       - Fix die_entrypc() when DW_AT_ranges DWARF attribute not available
      
       - Cope with broken DWARF (missing DW_AT_declaration) generated by some
         recent gcc versions
      
       - Do not generate CGROUP metadata events when not asked to in 'perf
         record'
      
       - Use proper CPU for shadow stats in 'perf stat'
      
       - Update copy of libbpf's hashmap.c, silencing tools/perf build warning
      
       - Fix return value in 'perf diff'
      
      * tag 'perf-tools-fixes-for-v5.10-2020-11-28' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
        perf probe: Change function definition check due to broken DWARF
        perf probe: Fix to die_entrypc() returns error correctly
        perf stat: Use proper cpu for shadow stats
        perf record: Synthesize cgroup events only if needed
        perf diff: Fix error return value in __cmd_diff()
        perf tools: Update copy of libbpf's hashmap.c
      ca579827
    • Linus Torvalds's avatar
      Merge tag 'usb-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 67f34fa8
      Linus Torvalds authored
      Pull USB / PHY driver fixes from Greg KH:
       "Here are a few small USB and PHY driver fixes for 5.10-rc6. They
        include:
      
         - small PHY driver fixes to resolve reported issues
      
         - USB quirks added for "broken" devices
      
         - typec fixes for reported problems
      
         - USB gadget fixes for small issues
      
        Full details are in the shortlog, nothing major in here and all have
        been in linux-next with no reported issues"
      
      * tag 'usb-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usb: typec: stusb160x: fix power-opmode property with typec-power-opmode
        USB: core: Change %pK for __user pointers to %px
        USB: core: Fix regression in Hercules audio card
        usb: gadget: Fix memleak in gadgetfs_fill_super
        usb: gadget: f_midi: Fix memleak in f_midi_alloc
        USB: quirks: Add USB_QUIRK_DISCONNECT_SUSPEND quirk for Lenovo A630Z TIO built-in usb-audio card
        usb: typec: qcom-pmic-typec: fix builtin build errors
        phy: mediatek: fix spelling mistake in Kconfig "veriosn" -> "version"
        phy: qualcomm: Fix 28 nm Hi-Speed USB PHY OF dependency
        phy: qualcomm: usb: Fix SuperSpeed PHY OF dependency
        phy: intel: PHY_INTEL_KEEMBAY_EMMC should depend on ARCH_KEEMBAY
        usb: cdns3: gadget: calculate TD_SIZE based on TD
        usb: cdns3: gadget: initialize link_trb as NULL
        phy: cpcap-usb: Use IRQF_ONESHOT
        phy: qcom-qmp: Initialize another pointer to NULL
        phy: tegra: xusb: Fix dangling pointer on probe failure
        phy: usb: Fix incorrect clearing of tca_drv_sel bit in SETUP reg for 7211
      67f34fa8
    • Linus Torvalds's avatar
      Merge tag 'char-misc-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 7b2c800d
      Linus Torvalds authored
      Pull char/misc driver fixes from Greg KH:
       "Here are some small misc driver fixes for 5.10-rc6.  They include:
      
         - interconnect fixes for reported problems
      
         - habanalabs bugfix for found issue when doing the switch fallthrough
           patches
      
         - MAINTAINERS file update for coresight reviewers/maintainers
      
        All have been in linux-next with no reported issues"
      
      * tag 'char-misc-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        MAINTAINERS: Adding help for coresight subsystem
        habanalabs/gaudi: fix missing code in ECC handling
        interconnect: fix memory trashing in of_count_icc_providers()
        interconnect: qcom: qcs404: Remove GPU and display RPM IDs
        interconnect: qcom: msm8916: Remove rpm-ids from non-RPM nodes
        interconnect: qcom: msm8974: Don't boost the NoC rate during boot
        interconnect: qcom: msm8974: Prevent integer overflow in rate
      7b2c800d
  4. 27 Nov, 2020 12 commits
    • Linus Torvalds's avatar
      Merge tag 'asm-generic-fixes-5.10-2' of... · c84e1efa
      Linus Torvalds authored
      Merge tag 'asm-generic-fixes-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
      
      Pull asm-generic fix from Arnd Bergmann:
       "Add correct MAX_POSSIBLE_PHYSMEM_BITS setting to asm-generic.
      
        This is a single bugfix for a bug that Stefan Agner found on 32-bit
        Arm, but that exists on several other architectures"
      
      * tag 'asm-generic-fixes-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
        arch: pgtable: define MAX_POSSIBLE_PHYSMEM_BITS where needed
      c84e1efa
    • Linus Torvalds's avatar
      Merge tag 'arm-soc-fixes-v5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · 303bc934
      Linus Torvalds authored
      Pull ARM SoC fixes from Arnd Bergmann:
       "Another set of patches for devicetree files and Arm SoC specific
        drivers:
      
         - A fix for OP-TEE shared memory on non-SMP systems
      
         - multiple code fixes for the OMAP platform, including one regression
           for the CPSW network driver and a few runtime warning fixes
      
         - Some DT patches for the Rockchip RK3399 platform, in particular
           fixing the MMC device ordering that recently became
           nondeterministic with async probe.
      
         - Multiple DT fixes for the Tegra platform, including a regression
           fix for suspend/resume on TX2
      
         - A regression fix for a user-triggered fault in the NXP dpio driver
      
         - A regression fix for a bug caused by an earlier bug fix in the
           xilinx firmware driver
      
         - Two more DTC warning fixes
      
         - Sylvain Lemieux steps down as maintainer for the NXP LPC32xx
           platform"
      
      * tag 'arm-soc-fixes-v5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (24 commits)
        arm64: tegra: Fix Tegra234 VDK node names
        arm64: tegra: Wrong AON HSP reg property size
        arm64: tegra: Fix USB_VBUS_EN0 regulator on Jetson TX1
        arm64: tegra: Correct the UART for Jetson Xavier NX
        arm64: tegra: Disable the ACONNECT for Jetson TX2
        optee: add writeback to valid memory type
        firmware: xilinx: Use hash-table for api feature check
        firmware: xilinx: Fix SD DLL node reset issue
        soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)
        ARM: dts: dra76x: m_can: fix order of clocks
        bus: ti-sysc: suppress err msg for timers used as clockevent/source
        MAINTAINERS: Remove myself as LPC32xx maintainers
        arm64: dts: qcom: clear the warnings caused by empty dma-ranges
        arm64: dts: broadcom: clear the warnings caused by empty dma-ranges
        ARM: dts: am437x-l4: fix compatible for cpsw switch dt node
        arm64: dts: rockchip: Reorder LED triggers from mmc devices on rk3399-roc-pc.
        arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards.
        arm64: dts: rockchip: Remove system-power-controller from pmic on Odroid Go Advance
        arm64: dts: rockchip: fix NanoPi R2S GMAC clock name
        ARM: OMAP2+: Manage MPU state properly for omap_enter_idle_coupled()
        ...
      303bc934
    • Linus Torvalds's avatar
      Merge tag 'net-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 79c0c1f0
      Linus Torvalds authored
      Pull networking fixes from Jakub Kicinski:
       "Networking fixes for 5.10-rc6, including fixes from the WiFi driver,
        and CAN subtrees.
      
        Current release - regressions:
      
         - gro_cells: reduce number of synchronize_net() calls
      
         - ch_ktls: release a lock before jumping to an error path
      
        Current release - always broken:
      
         - tcp: Allow full IP tos/IPv6 tclass to be reflected in L3 header
      
        Previous release - regressions:
      
         - net/tls: fix missing received data after fast remote close
      
         - vsock/virtio: discard packets only when socket is really closed
      
         - sock: set sk_err to ee_errno on dequeue from errq
      
         - cxgb4: fix the panic caused by non smac rewrite
      
        Previous release - always broken:
      
         - tcp: fix corner cases around setting ECN with BPF selection of
           congestion control
      
         - tcp: fix race condition when creating child sockets from syncookies
           on loopback interface
      
         - usbnet: ipheth: fix connectivity with iOS 14
      
         - tun: honor IOCB_NOWAIT flag
      
         - net/packet: fix packet receive on L3 devices without visible hard
           header
      
         - devlink: Make sure devlink instance and port are in same net
           namespace
      
         - net: openvswitch: fix TTL decrement action netlink message format
      
         - bonding: wait for sysfs kobject destruction before freeing struct
           slave
      
         - net: stmmac: fix upstream patch applied to the wrong context
      
         - bnxt_en: fix return value and unwind in probe error paths
      
        Misc:
      
         - devlink: add extra layer of categorization to the reload stats uAPI
           before it's released"
      
      * tag 'net-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (68 commits)
        sock: set sk_err to ee_errno on dequeue from errq
        mptcp: fix NULL ptr dereference on bad MPJ
        net: openvswitch: fix TTL decrement action netlink message format
        can: af_can: can_rx_unregister(): remove WARN() statement from list operation sanity check
        can: m_can: m_can_dev_setup(): add support for bosch mcan version 3.3.0
        can: m_can: fix nominal bitiming tseg2 min for version >= 3.1
        can: m_can: m_can_open(): remove IRQF_TRIGGER_FALLING from request_threaded_irq()'s flags
        can: mcp251xfd: mcp251xfd_probe(): bail out if no IRQ was given
        can: gs_usb: fix endianess problem with candleLight firmware
        ch_ktls: lock is not freed
        net/tls: Protect from calling tls_dev_del for TLS RX twice
        devlink: Make sure devlink instance and port are in same net namespace
        devlink: Hold rtnl lock while reading netdev attributes
        ptp: clockmatrix: bug fix for idtcm_strverscmp
        enetc: Let the hardware auto-advance the taprio base-time of 0
        gro_cells: reduce number of synchronize_net() calls
        net: stmmac: fix incorrect merge of patch upstream
        ipv6: addrlabel: fix possible memory leak in ip6addrlbl_net_init
        Documentation: netdev-FAQ: suggest how to post co-dependent series
        ibmvnic: enhance resetting status check during module exit
        ...
      79c0c1f0
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 80e1e176
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "Three small fixes in the UFS driver: two are for power management
        issues and the third is to fix a slew of problem in the sysfs code"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: ufs: Fix race between shutdown and runtime resume flow
        scsi: ufs: Make sure clk scaling happens only when HBA is runtime ACTIVE
        scsi: ufs: Fix unexpected values from ufshcd_read_desc_param()
      80e1e176
    • Linus Torvalds's avatar
      Merge tag 'io_uring-5.10-2020-11-27' of git://git.kernel.dk/linux-block · 9223e74f
      Linus Torvalds authored
      Pull io_uring fixes from Jens Axboe:
      
       - Out of bounds fix for the cq size cap from earlier this release (Joseph)
      
       - iov_iter type check fix (Pavel)
      
       - Files grab + cancelation fix (Pavel)
      
      * tag 'io_uring-5.10-2020-11-27' of git://git.kernel.dk/linux-block:
        io_uring: fix files grab/cancel race
        io_uring: fix ITER_BVEC check
        io_uring: fix shift-out-of-bounds when round up cq size
      9223e74f
    • Linus Torvalds's avatar
      Merge tag 'block-5.10-2020-11-27' of git://git.kernel.dk/linux-block · d021c3e5
      Linus Torvalds authored
      Pull block fix from Jens Axboe:
       "Just a single fix, for a crash in the keyslot manager"
      
      * tag 'block-5.10-2020-11-27' of git://git.kernel.dk/linux-block:
        block/keyslot-manager: prevent crash when num_slots=1
      d021c3e5
    • Linus Torvalds's avatar
      Merge tag 'for-5.10-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · a17a3ca5
      Linus Torvalds authored
      Pull btrfs fixes from David Sterba:
       "A few fixes for various warnings that accumulated over past two weeks:
      
         - tree-checker: add missing return values for some errors
      
         - lockdep fixes
            - when reading qgroup config and starting quota rescan
            - reverse order of quota ioctl lock and VFS freeze lock
      
         - avoid accessing potentially stale fs info during device scan,
           reported by syzbot
      
         - add scope NOFS protection around qgroup relation changes
      
         - check for running transaction before flushing qgroups
      
         - fix tracking of new delalloc ranges for some cases"
      
      * tag 'for-5.10-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        btrfs: fix lockdep splat when enabling and disabling qgroups
        btrfs: do nofs allocations when adding and removing qgroup relations
        btrfs: fix lockdep splat when reading qgroup config on mount
        btrfs: tree-checker: add missing returns after data_ref alignment checks
        btrfs: don't access possibly stale fs_info data for printing duplicate device
        btrfs: tree-checker: add missing return after error in root_item
        btrfs: qgroup: don't commit transaction when we already hold the handle
        btrfs: fix missing delalloc new bit for new delalloc ranges
      a17a3ca5
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma · d41e9b22
      Linus Torvalds authored
      Pull rdma fixes from Jason Gunthorpe:
       "Two security issues and several small bug fixes. Things seem to have
        stabilized for this release here.
      
        Summary:
      
         - Significant out of bounds access security issue in i40iw
      
         - Fix misuse of mmu notifiers in hfi1
      
         - Several errors in the register map/usage in hns
      
         - Missing error returns in mthca"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
        RDMA/hns: Bugfix for memory window mtpt configuration
        RDMA/hns: Fix retry_cnt and rnr_cnt when querying QP
        RDMA/hns: Fix wrong field of SRQ number the device supports
        IB/hfi1: Ensure correct mm is used at all times
        RDMA/i40iw: Address an mmap handler exploit in i40iw
        IB/mthca: fix return value of error branch in mthca_init_cq()
      d41e9b22
    • Linus Torvalds's avatar
      Merge tag 'mtd/fixes-for-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux · 76dc2bfc
      Linus Torvalds authored
      Pull mtd fixes from Miquel Raynal:
       "Because of a recent change in the core, NAND controller drivers
        initializing the ECC engine too early in the probe path are broken.
      
        Drivers should wait for the NAND device to be discovered and its
        memory layout known before doing any ECC related initialization, so
        instead of reverting the faulty change which is actually moving in the
        right direction, let's fix the drivers directly: socrates, sharpsl,
        r852, plat_nand, pasemi, tmio, txx9ndfmc, orion, mpc5121, lpc32xx_slc,
        lpc32xx_mlc, fsmc, diskonchip, davinci, cs553x, au1550, ams-delta,
        xway and gpio"
      
      * tag 'mtd/fixes-for-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
        mtd: rawnand: socrates: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: sharpsl: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: r852: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: plat_nand: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: pasemi: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: tmio: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: txx9ndfmc: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: orion: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: mpc5121: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: lpc32xx_slc: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: lpc32xx_mlc: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: fsmc: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: diskonchip: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: davinci: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: cs553x: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: au1550: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: ams-delta: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: xway: Move the ECC initialization to ->attach_chip()
        mtd: rawnand: gpio: Move the ECC initialization to ->attach_chip()
      76dc2bfc
    • Linus Torvalds's avatar
      Merge tag 'spi-fix-v5.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 87c301ca
      Linus Torvalds authored
      Pull spi fixes from Mark Brown:
       "A few fixes for v5.10,  one for the core which fixes some potential
        races for controllers with multiple chip selects when configuration of
        the chip select for one client device races with the addition and
        initial setup of an additional client"
      
      * tag 'spi-fix-v5.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: dw: Fix spi registration for controllers overriding CS
        spi: imx: fix the unbalanced spi runtime pm management
        spi: spi-nxp-fspi: fix fspi panic by unexpected interrupts
        spi: Take the SPI IO-mutex in the spi_setup() method
      87c301ca
    • Linus Torvalds's avatar
      Merge tag 'media/v5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · f594139d
      Linus Torvalds authored
      Pull virtual digital TV driver fixes from Mauro Carvalho Chehab:
       "A series of fixes for the new virtual digital TV driver (vidtv), which
        is meant to help doing tests with the digital TV core and media
        userspace apps and libraries.
      
        They cover a series of issues I found on it, together with a few new
        things in order to make it easier to detect problems at the DVB core"
      
      * tag 'media/v5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (36 commits)
        media: vidtv.rst: add kernel-doc markups
        media: vidtv.rst: update vidtv documentation
        media: vidtv: simplify EIT write function
        media: vidtv: simplify NIT write function
        media: vidtv: simplify SDT write function
        media: vidtv: cleanup PMT write table function
        media: vidtv: cleanup PAT write function
        media: vidtv: cleanup PSI table header function
        media: vidtv: cleanup PSI descriptor write function
        media: vidtv: simplify the crc writing logic
        media: vidtv: simplify PSI write function
        media: vidtv: add date to the current event
        media: vidtv: fix service_id at SDT table
        media: vidtv: fix service type
        media: vidtv: add a PID entry for the NIT table
        media: vidtv: properly fill EIT service_id
        media: vidtv: fix the network ID range
        media: vidtv: improve EIT data
        media: vidtv: cleanup null packet initialization logic
        media: vidtv: pre-initialize mux arrays
        ...
      f594139d
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-2020-11-27-1' of git://anongit.freedesktop.org/drm/drm · 6910b676
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Unfortunately this has a bit of thanksgiving stuffing in it, as it a
        bit larger (at least the vc4 patches) than I like at this point in
        time.
      
        The main thing is it has a bunch of regressions fixes for reports in
        the last couple of weeks, ast, nouveau and the amdgpu ttm init fix,
        along with the usual selection of amdgpu and i915 fixes.
      
        The vc4 fixes are a few but they are fixes and the nastiest one is a
        fix for when you have a 2.4Ghz Wifi and a HDMI signal with a clock in
        that range and there isn't enough shielding and interference happen
        between the two, the fix adjusts the mode clock to try and avoid the
        wifi channels in that case.
      
        Hopefully you can merge this between turkey slices, and next week
        should be quieter.
      
        ast:
         - LUT loading regression fix
      
        nouveau:
         - relocations regression fix
      
        amdgpu:
         - ttm init oops fix
         - Runtime pm fix
         - SI UVD suspend/resume fix
         - HDCP fix for headless cards
         - Sienna Cichlid golden register update
      
        i915:
         - Fix Perf/OA workaround register corruption (Lionel)
         - Correct a comment statement in GVT (Yan)
         - Fix GT enable/disable iterrupts, including a race condition that
           prevented GPU to go idle (Chris)
         - Free stale request on destroying the virtual engine (Chris)
      
        exynos:
         - config dependency fix
      
        mediatek:
         - unused var removal
         - horizonal front/back porch formula fix
      
        vc4:
         - wifi and hdmi interference fix
         - mode rejection fixes
         - use after free fix
         - cleanup some code"
      
      * tag 'drm-fixes-2020-11-27-1' of git://anongit.freedesktop.org/drm/drm: (28 commits)
        drm/nouveau: fix relocations applying logic and a double-free
        drm/ast: Reload gamma LUT after changing primary plane's color format
        drm/amdgpu: Fix size calculation when init onchip memory
        drm/amdgpu: update golden setting for sienna_cichlid
        drm/amd/display: Avoid HDCP initialization in devices without output
        drm/i915/gt: Free stale request on destroying the virtual engine
        drm/i915/gt: Don't cancel the interrupt shadow too early
        drm/i915/gt: Track signaled breadcrumbs outside of the breadcrumb spinlock
        drm/amdgpu: fix a page fault
        drm/amdgpu: fix SI UVD firmware validate resume fail
        drm/amd/amdgpu: fix null pointer in runtime pm
        drm/i915/gt: Defer enabling the breadcrumb interrupt to after submission
        drm/i915/gvt: correct a false comment of flag F_UNALIGN
        drm/i915/perf: workaround register corruption in OATAILPTR
        drm/vc4: kms: Don't disable the muxing of an active CRTC
        drm/vc4: kms: Store the unassigned channel list in the state
        drm/exynos: depend on COMMON_CLK to fix compile tests
        drm/mediatek: dsi: Modify horizontal front/back porch byte formula
        drm/vc4: hdmi: Disable Wifi Frequencies
        dt-bindings: display: Add a property to deal with WiFi coexistence
        ...
      6910b676