1. 10 Jan, 2022 1 commit
    • Zhihao Cheng's avatar
      ubifs: Rename whiteout atomically · 278d9a24
      Zhihao Cheng authored
      Currently, rename whiteout has 3 steps:
        1. create tmpfile(which associates old dentry to tmpfile inode) for
           whiteout, and store tmpfile to disk
        2. link whiteout, associate whiteout inode to old dentry agagin and
           store old dentry, old inode, new dentry on disk
        3. writeback dirty whiteout inode to disk
      
      Suddenly power-cut or error occurring(eg. ENOSPC returned by budget,
      memory allocation failure) during above steps may cause kinds of problems:
        Problem 1: ENOSPC returned by whiteout space budget (before step 2),
      	     old dentry will disappear after rename syscall, whiteout file
      	     cannot be found either.
      
      	     ls dir  // we get file, whiteout
      	     rename(dir/file, dir/whiteout, REANME_WHITEOUT)
      	     ENOSPC = ubifs_budget_space(&wht_req) // return
      	     ls dir  // empty (no file, no whiteout)
        Problem 2: Power-cut happens before step 3, whiteout inode with 'nlink=1'
      	     is not stored on disk, whiteout dentry(old dentry) is written
      	     on disk, whiteout file is lost on next mount (We get "dead
      	     directory entry" after executing 'ls -l' on whiteout file).
      
      Now, we use following 3 steps to finish rename whiteout:
        1. create an in-mem inode with 'nlink = 1' as whiteout
        2. ubifs_jnl_rename (Write on disk to finish associating old dentry to
           whiteout inode, associating new dentry with old inode)
        3. iput(whiteout)
      
      Rely writing in-mem inode on disk by ubifs_jnl_rename() to finish rename
      whiteout, which avoids middle disk state caused by suddenly power-cut
      and error occurring.
      
      Fixes: 9e0a1fff ("ubifs: Implement RENAME_WHITEOUT")
      Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      278d9a24
  2. 09 Jan, 2022 5 commits
    • Zhihao Cheng's avatar
      ubifs: Add missing iput if do_tmpfile() failed in rename whiteout · 716b4573
      Zhihao Cheng authored
      whiteout inode should be put when do_tmpfile() failed if inode has been
      initialized. Otherwise we will get following warning during umount:
        UBIFS error (ubi0:0 pid 1494): ubifs_assert_failed [ubifs]: UBIFS
        assert failed: c->bi.dd_growth == 0, in fs/ubifs/super.c:1930
        VFS: Busy inodes after unmount of ubifs. Self-destruct in 5 seconds.
      
      Fixes: 9e0a1fff ("ubifs: Implement RENAME_WHITEOUT")
      Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
      Suggested-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      716b4573
    • Zhihao Cheng's avatar
      ubifs: Fix wrong number of inodes locked by ui_mutex in ubifs_inode comment · 7a8884fe
      Zhihao Cheng authored
      Since 9ec64962("ubifs: Implement RENAME_EXCHANGE") and
      9e0a1fff("ubifs: Implement RENAME_WHITEOUT") are applied,
      ubifs_rename locks and changes 4 ubifs inodes, correct the comment
      for ui_mutex in ubifs_inode.
      Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      7a8884fe
    • Zhihao Cheng's avatar
      ubifs: Fix deadlock in concurrent rename whiteout and inode writeback · afd42704
      Zhihao Cheng authored
      Following hung tasks:
      [   77.028764] task:kworker/u8:4    state:D stack:    0 pid:  132
      [   77.028820] Call Trace:
      [   77.029027]  schedule+0x8c/0x1b0
      [   77.029067]  mutex_lock+0x50/0x60
      [   77.029074]  ubifs_write_inode+0x68/0x1f0 [ubifs]
      [   77.029117]  __writeback_single_inode+0x43c/0x570
      [   77.029128]  writeback_sb_inodes+0x259/0x740
      [   77.029148]  wb_writeback+0x107/0x4d0
      [   77.029163]  wb_workfn+0x162/0x7b0
      
      [   92.390442] task:aa              state:D stack:    0 pid: 1506
      [   92.390448] Call Trace:
      [   92.390458]  schedule+0x8c/0x1b0
      [   92.390461]  wb_wait_for_completion+0x82/0xd0
      [   92.390469]  __writeback_inodes_sb_nr+0xb2/0x110
      [   92.390472]  writeback_inodes_sb_nr+0x14/0x20
      [   92.390476]  ubifs_budget_space+0x705/0xdd0 [ubifs]
      [   92.390503]  do_rename.cold+0x7f/0x187 [ubifs]
      [   92.390549]  ubifs_rename+0x8b/0x180 [ubifs]
      [   92.390571]  vfs_rename+0xdb2/0x1170
      [   92.390580]  do_renameat2+0x554/0x770
      
      , are caused by concurrent rename whiteout and inode writeback processes:
      	rename_whiteout(Thread 1)	        wb_workfn(Thread2)
      ubifs_rename
        do_rename
          lock_4_inodes (Hold ui_mutex)
          ubifs_budget_space
            make_free_space
              shrink_liability
      	  __writeback_inodes_sb_nr
      	    bdi_split_work_to_wbs (Queue new wb work)
      					      wb_do_writeback(wb work)
      						__writeback_single_inode
      					          ubifs_write_inode
      					            LOCK(ui_mutex)
      							   ↑
      	      wb_wait_for_completion (Wait wb work) <-- deadlock!
      
      Reproducer (Detail program in [Link]):
        1. SYS_renameat2("/mp/dir/file", "/mp/dir/whiteout", RENAME_WHITEOUT)
        2. Consume out of space before kernel(mdelay) doing budget for whiteout
      
      Fix it by doing whiteout space budget before locking ubifs inodes.
      BTW, it also fixes wrong goto tag 'out_release' in whiteout budget
      error handling path(It should at least recover dir i_size and unlock
      4 ubifs inodes).
      
      Fixes: 9e0a1fff ("ubifs: Implement RENAME_WHITEOUT")
      Link: https://bugzilla.kernel.org/show_bug.cgi?id=214733Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      afd42704
    • Zhihao Cheng's avatar
      ubifs: rename_whiteout: Fix double free for whiteout_ui->data · 40a8f0d5
      Zhihao Cheng authored
      'whiteout_ui->data' will be freed twice if space budget fail for
      rename whiteout operation as following process:
      
      rename_whiteout
        dev = kmalloc
        whiteout_ui->data = dev
        kfree(whiteout_ui->data)  // Free first time
        iput(whiteout)
          ubifs_free_inode
            kfree(ui->data)	    // Double free!
      
      KASAN reports:
      ==================================================================
      BUG: KASAN: double-free or invalid-free in ubifs_free_inode+0x4f/0x70
      Call Trace:
        kfree+0x117/0x490
        ubifs_free_inode+0x4f/0x70 [ubifs]
        i_callback+0x30/0x60
        rcu_do_batch+0x366/0xac0
        __do_softirq+0x133/0x57f
      
      Allocated by task 1506:
        kmem_cache_alloc_trace+0x3c2/0x7a0
        do_rename+0x9b7/0x1150 [ubifs]
        ubifs_rename+0x106/0x1f0 [ubifs]
        do_syscall_64+0x35/0x80
      
      Freed by task 1506:
        kfree+0x117/0x490
        do_rename.cold+0x53/0x8a [ubifs]
        ubifs_rename+0x106/0x1f0 [ubifs]
        do_syscall_64+0x35/0x80
      
      The buggy address belongs to the object at ffff88810238bed8 which
      belongs to the cache kmalloc-8 of size 8
      ==================================================================
      
      Let ubifs_free_inode() free 'whiteout_ui->data'. BTW, delete unused
      assignment 'whiteout_ui->data_len = 0', process 'ubifs_evict_inode()
      -> ubifs_jnl_delete_inode() -> ubifs_jnl_write_inode()' doesn't need it
      (because 'inc_nlink(whiteout)' won't be excuted by 'goto out_release',
       and the nlink of whiteout inode is 0).
      
      Fixes: 9e0a1fff ("ubifs: Implement RENAME_WHITEOUT")
      Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      40a8f0d5
    • Baokun Li's avatar
      ubi: Fix race condition between ctrl_cdev_ioctl and ubi_cdev_ioctl · 3cbf0e39
      Baokun Li authored
      Hulk Robot reported a KASAN report about use-after-free:
       ==================================================================
       BUG: KASAN: use-after-free in __list_del_entry_valid+0x13d/0x160
       Read of size 8 at addr ffff888035e37d98 by task ubiattach/1385
       [...]
       Call Trace:
        klist_dec_and_del+0xa7/0x4a0
        klist_put+0xc7/0x1a0
        device_del+0x4d4/0xed0
        cdev_device_del+0x1a/0x80
        ubi_attach_mtd_dev+0x2951/0x34b0 [ubi]
        ctrl_cdev_ioctl+0x286/0x2f0 [ubi]
      
       Allocated by task 1414:
        device_add+0x60a/0x18b0
        cdev_device_add+0x103/0x170
        ubi_create_volume+0x1118/0x1a10 [ubi]
        ubi_cdev_ioctl+0xb7f/0x1ba0 [ubi]
      
       Freed by task 1385:
        cdev_device_del+0x1a/0x80
        ubi_remove_volume+0x438/0x6c0 [ubi]
        ubi_cdev_ioctl+0xbf4/0x1ba0 [ubi]
       [...]
       ==================================================================
      
      The lock held by ctrl_cdev_ioctl is ubi_devices_mutex, but the lock held
      by ubi_cdev_ioctl is ubi->device_mutex. Therefore, the two locks can be
      concurrent.
      
      ctrl_cdev_ioctl contains two operations: ubi_attach and ubi_detach.
      ubi_detach is bug-free because it uses reference counting to prevent
      concurrency. However, uif_init and uif_close in ubi_attach may race with
      ubi_cdev_ioctl.
      
      uif_init will race with ubi_cdev_ioctl as in the following stack.
                 cpu1                   cpu2                  cpu3
      _______________________|________________________|______________________
      ctrl_cdev_ioctl
       ubi_attach_mtd_dev
        uif_init
                                 ubi_cdev_ioctl
                                  ubi_create_volume
                                   cdev_device_add
         ubi_add_volume
         // sysfs exist
         kill_volumes
                                                          ubi_cdev_ioctl
                                                           ubi_remove_volume
                                                            cdev_device_del
                                                             // first free
          ubi_free_volume
           cdev_del
           // double free
         cdev_device_del
      
      And uif_close will race with ubi_cdev_ioctl as in the following stack.
                 cpu1                   cpu2                  cpu3
      _______________________|________________________|______________________
      ctrl_cdev_ioctl
       ubi_attach_mtd_dev
        uif_init
                                 ubi_cdev_ioctl
                                  ubi_create_volume
                                   cdev_device_add
        ubi_debugfs_init_dev
        //error goto out_uif;
        uif_close
         kill_volumes
                                                          ubi_cdev_ioctl
                                                           ubi_remove_volume
                                                            cdev_device_del
                                                             // first free
          ubi_free_volume
          // double free
      
      The cause of this problem is that commit 714fb87e make device
      "available" before it becomes accessible via sysfs. Therefore, we
      roll back the modification. We will fix the race condition between
      ubi device creation and udev by removing ubi_get_device in
      vol_attribute_show and dev_attribute_show.This avoids accessing
      uninitialized ubi_devices[ubi_num].
      
      ubi_get_device is used to prevent devices from being deleted during
      sysfs execution. However, now kernfs ensures that devices will not
      be deleted before all reference counting are released.
      The key process is shown in the following stack.
      
      device_del
        device_remove_attrs
          device_remove_groups
            sysfs_remove_groups
              sysfs_remove_group
                remove_files
                  kernfs_remove_by_name
                    kernfs_remove_by_name_ns
                      __kernfs_remove
                        kernfs_drain
      
      Fixes: 714fb87e ("ubi: Fix race condition between ubi device creation and udev")
      Reported-by: default avatarHulk Robot <hulkci@huawei.com>
      Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      3cbf0e39
  3. 23 Dec, 2021 11 commits
    • Kyeong Yoo's avatar
      jffs2: GC deadlock reading a page that is used in jffs2_write_begin() · aa39cc67
      Kyeong Yoo authored
      GC task can deadlock in read_cache_page() because it may attempt
      to release a page that is actually allocated by another task in
      jffs2_write_begin().
      The reason is that in jffs2_write_begin() there is a small window
      a cache page is allocated for use but not set Uptodate yet.
      
      This ends up with a deadlock between two tasks:
      1) A task (e.g. file copy)
         - jffs2_write_begin() locks a cache page
         - jffs2_write_end() tries to lock "alloc_sem" from
      	 jffs2_reserve_space() <-- STUCK
      2) GC task (jffs2_gcd_mtd3)
         - jffs2_garbage_collect_pass() locks "alloc_sem"
         - try to lock the same cache page in read_cache_page() <-- STUCK
      
      So to avoid this deadlock, hold "alloc_sem" in jffs2_write_begin()
      while reading data in a cache page.
      Signed-off-by: default avatarKyeong Yoo <kyeong.yoo@alliedtelesis.co.nz>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      aa39cc67
    • Baokun Li's avatar
      ubifs: read-only if LEB may always be taken in ubifs_garbage_collect · 50cb4373
      Baokun Li authored
      If ubifs_garbage_collect_leb() returns -EAGAIN and ubifs_return_leb
      returns error, a LEB will always has a "taken" flag. In this case,
      set the ubifs to read-only to prevent a worse situation.
      Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      50cb4373
    • Baokun Li's avatar
      ubifs: fix double return leb in ubifs_garbage_collect · 0d765021
      Baokun Li authored
      If ubifs_garbage_collect_leb() returns -EAGAIN and enters the "out"
      branch, ubifs_return_leb will execute twice on the same lnum. This
      can cause data loss in concurrency situations.
      Reported-by: default avatarHulk Robot <hulkci@huawei.com>
      Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      0d765021
    • Baokun Li's avatar
      ubifs: fix slab-out-of-bounds in ubifs_change_lp · 88618fee
      Baokun Li authored
      Hulk Robot reported a KASAN report about slab-out-of-bounds:
       ==================================================================
       BUG: KASAN: slab-out-of-bounds in ubifs_change_lp+0x3a9/0x1390 [ubifs]
       Read of size 8 at addr ffff888101c961f8 by task fsstress/1068
       [...]
       Call Trace:
        check_memory_region+0x1c1/0x1e0
        ubifs_change_lp+0x3a9/0x1390 [ubifs]
        ubifs_change_one_lp+0x170/0x220 [ubifs]
        ubifs_garbage_collect+0x7f9/0xda0 [ubifs]
        ubifs_budget_space+0xfe4/0x1bd0 [ubifs]
        ubifs_write_begin+0x528/0x10c0 [ubifs]
      
       Allocated by task 1068:
        kmemdup+0x25/0x50
        ubifs_lpt_lookup_dirty+0x372/0xb00 [ubifs]
        ubifs_update_one_lp+0x46/0x260 [ubifs]
        ubifs_tnc_end_commit+0x98b/0x1720 [ubifs]
        do_commit+0x6cb/0x1950 [ubifs]
        ubifs_run_commit+0x15a/0x2b0 [ubifs]
        ubifs_budget_space+0x1061/0x1bd0 [ubifs]
        ubifs_write_begin+0x528/0x10c0 [ubifs]
       [...]
       ==================================================================
      
      In ubifs_garbage_collect(), if ubifs_find_dirty_leb returns an error,
      lp is an uninitialized variable. But lp.num might be used in the out
      branch, which is a random value. If the value is -1 or another value
      that can pass the check, soob may occur in the ubifs_change_lp() in
      the following procedure.
      
      To solve this problem, we initialize lp.lnum to -1, and then initialize
      it correctly in ubifs_find_dirty_leb, which is not equal to -1, and
      ubifs_return_leb is executed only when lp.lnum != -1.
      
      if find a retained or indexing LEB and continue to next loop, but break
      before find another LEB, the "taken" flag of this LEB will be cleaned
      in ubi_return_lebi(). This bug has also been fixed in this patch.
      Reported-by: default avatarHulk Robot <hulkci@huawei.com>
      Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      88618fee
    • Dan Carpenter's avatar
      ubifs: fix snprintf() length check · d3de970b
      Dan Carpenter authored
      The snprintf() function returns the number of bytes (not including the
      NUL terminator) which would have been printed if there were enough
      space.  So it can be greater than UBIFS_DFS_DIR_LEN.  And actually if
      it equals UBIFS_DFS_DIR_LEN then that's okay so this check is too
      strict.
      
      Fixes: 9a620291fc01 ("ubifs: Export filesystem error counters")
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      d3de970b
    • Stefan Schaeckeler's avatar
      ubifs: Document sysfs nodes · 58225631
      Stefan Schaeckeler authored
      Add documentation for the new sysfs nodes
      
       /sys/fs/ubifs/ubiX_Y/errors_magic
       /sys/fs/ubifs/ubiX_Y/errors_node
       /sys/fs/ubifs/ubiX_Y/errors_crc
      Signed-off-by: default avatarStefan Schaeckeler <sschaeck@cisco.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      58225631
    • Stefan Schaeckeler's avatar
      ubifs: Export filesystem error counters · 2e3cbf42
      Stefan Schaeckeler authored
      Not all ubifs filesystem errors are propagated to userspace.
      
      Export bad magic, bad node and crc errors via sysfs. This allows userspace
      to notice filesystem errors:
      
       /sys/fs/ubifs/ubiX_Y/errors_magic
       /sys/fs/ubifs/ubiX_Y/errors_node
       /sys/fs/ubifs/ubiX_Y/errors_crc
      
      The counters are reset to 0 with a remount.
      Signed-off-by: default avatarStefan Schaeckeler <sschaeck@cisco.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      2e3cbf42
    • Petr Cvachoucek's avatar
      ubifs: Error path in ubifs_remount_rw() seems to wrongly free write buffers · 3fea4d9d
      Petr Cvachoucek authored
      it seems freeing the write buffers in the error path of the
      ubifs_remount_rw() is wrong. It leads later to a kernel oops like this:
      
      [10016.431274] UBIFS (ubi0:0): start fixing up free space
      [10090.810042] UBIFS (ubi0:0): free space fixup complete
      [10090.814623] UBIFS error (ubi0:0 pid 512): ubifs_remount_fs: cannot
      spawn "ubifs_bgt0_0", error -4
      [10101.915108] UBIFS (ubi0:0): background thread "ubifs_bgt0_0" started,
      PID 517
      [10105.275498] Unable to handle kernel NULL pointer dereference at
      virtual address 0000000000000030
      [10105.284352] Mem abort info:
      [10105.287160]   ESR = 0x96000006
      [10105.290252]   EC = 0x25: DABT (current EL), IL = 32 bits
      [10105.295592]   SET = 0, FnV = 0
      [10105.298652]   EA = 0, S1PTW = 0
      [10105.301848] Data abort info:
      [10105.304723]   ISV = 0, ISS = 0x00000006
      [10105.308573]   CM = 0, WnR = 0
      [10105.311564] user pgtable: 4k pages, 48-bit VAs, pgdp=00000000f03d1000
      [10105.318034] [0000000000000030] pgd=00000000f6cee003,
      pud=00000000f4884003, pmd=0000000000000000
      [10105.326783] Internal error: Oops: 96000006 [#1] PREEMPT SMP
      [10105.332355] Modules linked in: ath10k_pci ath10k_core ath mac80211
      libarc4 cfg80211 nvme nvme_core cryptodev(O)
      [10105.342468] CPU: 3 PID: 518 Comm: touch Tainted: G           O
      5.4.3 #1
      [10105.349517] Hardware name: HYPEX CPU (DT)
      [10105.353525] pstate: 40000005 (nZcv daif -PAN -UAO)
      [10105.358324] pc : atomic64_try_cmpxchg_acquire.constprop.22+0x8/0x34
      [10105.364596] lr : mutex_lock+0x1c/0x34
      [10105.368253] sp : ffff000075633aa0
      [10105.371563] x29: ffff000075633aa0 x28: 0000000000000001
      [10105.376874] x27: ffff000076fa80c8 x26: 0000000000000004
      [10105.382185] x25: 0000000000000030 x24: 0000000000000000
      [10105.387495] x23: 0000000000000000 x22: 0000000000000038
      [10105.392807] x21: 000000000000000c x20: ffff000076fa80c8
      [10105.398119] x19: ffff000076fa8000 x18: 0000000000000000
      [10105.403429] x17: 0000000000000000 x16: 0000000000000000
      [10105.408741] x15: 0000000000000000 x14: fefefefefefefeff
      [10105.414052] x13: 0000000000000000 x12: 0000000000000fe0
      [10105.419364] x11: 0000000000000fe0 x10: ffff000076709020
      [10105.424675] x9 : 0000000000000000 x8 : 00000000000000a0
      [10105.429986] x7 : ffff000076fa80f4 x6 : 0000000000000030
      [10105.435297] x5 : 0000000000000000 x4 : 0000000000000000
      [10105.440609] x3 : 0000000000000000 x2 : ffff00006f276040
      [10105.445920] x1 : ffff000075633ab8 x0 : 0000000000000030
      [10105.451232] Call trace:
      [10105.453676]  atomic64_try_cmpxchg_acquire.constprop.22+0x8/0x34
      [10105.459600]  ubifs_garbage_collect+0xb4/0x334
      [10105.463956]  ubifs_budget_space+0x398/0x458
      [10105.468139]  ubifs_create+0x50/0x180
      [10105.471712]  path_openat+0x6a0/0x9b0
      [10105.475284]  do_filp_open+0x34/0x7c
      [10105.478771]  do_sys_open+0x78/0xe4
      [10105.482170]  __arm64_sys_openat+0x1c/0x24
      [10105.486180]  el0_svc_handler+0x84/0xc8
      [10105.489928]  el0_svc+0x8/0xc
      [10105.492808] Code: 52800013 17fffffb d2800003 f9800011 (c85ffc05)
      [10105.498903] ---[ end trace 46b721d93267a586 ]---
      
      To reproduce the problem:
      
      1. Filesystem initially mounted read-only, free space fixup flag set.
      
      2. mount -o remount,rw <mountpoint>
      
      3. it takes some time (free space fixup running)
          ... try to terminate running mount by CTRL-C
          ... does not respond, only after free space fixup is complete
          ... then "ubifs_remount_fs: cannot spawn "ubifs_bgt0_0", error -4"
      
      4. mount -o remount,rw <mountpoint>
          ... now finished instantly (fixup already done).
      
      5. Create file or just unmount the filesystem and we get the oops.
      
      Cc: <stable@vger.kernel.org>
      Fixes: b50b9f40 ("UBIFS: do not free write-buffers when in R/O mode")
      Signed-off-by: default avatarPetr Cvachoucek <cvachoucek@gmail.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      3fea4d9d
    • Cai Huoqing's avatar
      ubifs: Make use of the helper macro kthread_run() · d98c6c35
      Cai Huoqing authored
      Repalce kthread_create/wake_up_process() with kthread_run()
      to simplify the code.
      Signed-off-by: default avatarCai Huoqing <caihuoqing@baidu.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      d98c6c35
    • Kai Song's avatar
      ubi: Fix a mistake in comment · bc7849e2
      Kai Song authored
      Fixes: 2a734bb8 ("UBI: use debugfs for the extra checks knobs")
      There is a mistake in docstrings, it should be ubi_debugfs_exit_dev
      instead of dbg_debug_exit_dev.
      Signed-off-by: default avatarKai Song <songkai01@inspur.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      bc7849e2
    • Alexander Dahl's avatar
      ubifs: Fix spelling mistakes · 7296c8af
      Alexander Dahl authored
      Found with `codespell -i 3 -w fs/ubifs/**` and proof reading that parts.
      Signed-off-by: default avatarAlexander Dahl <ada@thorsis.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      7296c8af
  4. 19 Dec, 2021 14 commits
  5. 18 Dec, 2021 9 commits
    • Linus Torvalds's avatar
      Merge tag 'tty-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 3f667b5d
      Linus Torvalds authored
      Pull tty/serial fixes from Greg KH:
       "Here are two small tty/serial fixes for 5.16-rc6.  They include:
      
         - n_hdlc fix for syzbot reported problem that you were previously
           copied on.
      
         - 8250_fintek driver fix that resolved a console problem by removing
           a previous change.
      
        Both have been in linux-next with no reported issues"
      
      * tag 'tty-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        serial: 8250_fintek: Fix garbled text for console
        tty: n_hdlc: make n_hdlc_tty_wakeup() asynchronous
      3f667b5d
    • Linus Torvalds's avatar
      Merge tag 'usb-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · fb7d0829
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are a number of small USB driver fixes for reported problems.
        They include:
      
         - dwc2 driver fixes
      
         - xhci driver fixes
      
         - cdnsp driver fixes
      
         - typec driver fix
      
         - gadget u_ether driver fix
      
         - new quirk additions
      
         - usb gadget endpoint calculation fix
      
         - usb serial new device ids
      
         - revert of a xhci-dbg change that broke early debug booting
      
        All changes, except for the revert, have been in linux-next with no
        reported problems. The revert was from yesterday, and it was reported
        by the developers affected that it resolved their problem"
      
      * tag 'usb-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        Revert "usb: early: convert to readl_poll_timeout_atomic()"
        usb: typec: tcpm: fix tcpm unregister port but leave a pending timer
        usb: cdnsp: Fix lack of spin_lock_irqsave/spin_lock_restore
        USB: NO_LPM quirk Lenovo USB-C to Ethernet Adapher(RTL8153-04)
        usb: xhci: Extend support for runtime power management for AMD's Yellow carp.
        usb: dwc2: fix STM ID/VBUS detection startup delay in dwc2_driver_probe
        USB: gadget: bRequestType is a bitfield, not a enum
        USB: serial: option: add Telit FN990 compositions
        USB: serial: cp210x: fix CP2105 GPIO registration
        usb: cdnsp: Fix incorrect status for control request
        usb: cdnsp: Fix issue in cdnsp_log_ep trace event
        usb: cdnsp: Fix incorrect calling of cdnsp_died function
        usb: xhci-mtk: fix list_del warning when enable list debug
        usb: gadget: u_ether: fix race in setting MAC address in setup phase
      fb7d0829
    • Linus Torvalds's avatar
      Merge tag 'perf-tools-fixes-for-v5.16-2021-12-18' of... · 0f03adcc
      Linus Torvalds authored
      Merge tag 'perf-tools-fixes-for-v5.16-2021-12-18' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
      
      Pull perf tools fixes from Arnaldo Carvalho de Melo:
      
       - Fix segfaults in 'perf inject' related to usage of unopened files
      
       - The return value of hashmap__new() should be checked using IS_ERR()
      
      * tag 'perf-tools-fixes-for-v5.16-2021-12-18' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
        perf inject: Fix segfault due to perf_data__fd() without open
        perf inject: Fix segfault due to close without open
        perf expr: Fix missing check for return value of hashmap__new()
      0f03adcc
    • Adrian Hunter's avatar
      perf inject: Fix segfault due to perf_data__fd() without open · c271a55b
      Adrian Hunter authored
      The fixed commit attempts to get the output file descriptor even if the
      file was never opened e.g.
      
        $ perf record uname
        Linux
        [ perf record: Woken up 1 times to write data ]
        [ perf record: Captured and wrote 0.002 MB perf.data (7 samples) ]
        $ perf inject -i perf.data --vm-time-correlation=dry-run
        Segmentation fault (core dumped)
        $ gdb --quiet perf
        Reading symbols from perf...
        (gdb) r inject -i perf.data --vm-time-correlation=dry-run
        Starting program: /home/ahunter/bin/perf inject -i perf.data --vm-time-correlation=dry-run
        [Thread debugging using libthread_db enabled]
        Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
      
        Program received signal SIGSEGV, Segmentation fault.
        __GI___fileno (fp=0x0) at fileno.c:35
        35      fileno.c: No such file or directory.
        (gdb) bt
        #0  __GI___fileno (fp=0x0) at fileno.c:35
        #1  0x00005621e48dd987 in perf_data__fd (data=0x7fff4c68bd08) at util/data.h:72
        #2  perf_data__fd (data=0x7fff4c68bd08) at util/data.h:69
        #3  cmd_inject (argc=<optimized out>, argv=0x7fff4c69c1f0) at builtin-inject.c:1017
        #4  0x00005621e4936783 in run_builtin (p=0x5621e4ee6878 <commands+600>, argc=4, argv=0x7fff4c69c1f0) at perf.c:313
        #5  0x00005621e4897d5c in handle_internal_command (argv=<optimized out>, argc=<optimized out>) at perf.c:365
        #6  run_argv (argcp=<optimized out>, argv=<optimized out>) at perf.c:409
        #7  main (argc=4, argv=0x7fff4c69c1f0) at perf.c:539
        (gdb)
      
      Fixes: 0ae03893 ("perf tools: Pass a fd to perf_file_header__read_pipe()")
      Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
      Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Riccardo Mancini <rickyman7@gmail.com>
      Cc: stable@vger.kernel.org
      Link: http://lore.kernel.org/lkml/20211213084829.114772-3-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      c271a55b
    • Adrian Hunter's avatar
      perf inject: Fix segfault due to close without open · 0c8e32fe
      Adrian Hunter authored
      The fixed commit attempts to close inject.output even if it was never
      opened e.g.
      
        $ perf record uname
        Linux
        [ perf record: Woken up 1 times to write data ]
        [ perf record: Captured and wrote 0.002 MB perf.data (7 samples) ]
        $ perf inject -i perf.data --vm-time-correlation=dry-run
        Segmentation fault (core dumped)
        $ gdb --quiet perf
        Reading symbols from perf...
        (gdb) r inject -i perf.data --vm-time-correlation=dry-run
        Starting program: /home/ahunter/bin/perf inject -i perf.data --vm-time-correlation=dry-run
        [Thread debugging using libthread_db enabled]
        Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
      
        Program received signal SIGSEGV, Segmentation fault.
        0x00007eff8afeef5b in _IO_new_fclose (fp=0x0) at iofclose.c:48
        48      iofclose.c: No such file or directory.
        (gdb) bt
        #0  0x00007eff8afeef5b in _IO_new_fclose (fp=0x0) at iofclose.c:48
        #1  0x0000557fc7b74f92 in perf_data__close (data=data@entry=0x7ffcdafa6578) at util/data.c:376
        #2  0x0000557fc7a6b807 in cmd_inject (argc=<optimized out>, argv=<optimized out>) at builtin-inject.c:1085
        #3  0x0000557fc7ac4783 in run_builtin (p=0x557fc8074878 <commands+600>, argc=4, argv=0x7ffcdafb6a60) at perf.c:313
        #4  0x0000557fc7a25d5c in handle_internal_command (argv=<optimized out>, argc=<optimized out>) at perf.c:365
        #5  run_argv (argcp=<optimized out>, argv=<optimized out>) at perf.c:409
        #6  main (argc=4, argv=0x7ffcdafb6a60) at perf.c:539
        (gdb)
      
      Fixes: 02e6246f ("perf inject: Close inject.output on exit")
      Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
      Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Riccardo Mancini <rickyman7@gmail.com>
      Cc: stable@vger.kernel.org
      Link: http://lore.kernel.org/lkml/20211213084829.114772-2-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      0c8e32fe
    • Miaoqian Lin's avatar
      perf expr: Fix missing check for return value of hashmap__new() · 0a515a06
      Miaoqian Lin authored
      The hashmap__new() function may return ERR_PTR(-ENOMEM) when malloc()
      fails, add IS_ERR() checking for ctx->ids.
      Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Ian Rogers <irogers@google.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>
      Link: http://lore.kernel.org/lkml/20211212062504.25841-1-linmq006@gmail.com
      [ s/kfree()/free()/ and add missing linux/err.h include ]
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      0a515a06
    • Zqiang's avatar
      locking/rtmutex: Fix incorrect condition in rtmutex_spin_on_owner() · 8f556a32
      Zqiang authored
      Optimistic spinning needs to be terminated when the spinning waiter is not
      longer the top waiter on the lock, but the condition is negated. It
      terminates if the waiter is the top waiter, which is defeating the whole
      purpose.
      
      Fixes: c3123c43 ("locking/rtmutex: Dont dereference waiter lockless")
      Signed-off-by: default avatarZqiang <qiang1.zhang@intel.com>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: stable@vger.kernel.org
      Link: https://lore.kernel.org/r/20211217074207.77425-1-qiang1.zhang@intel.com
      8f556a32
    • Linus Torvalds's avatar
      Merge tag 'libata-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata · 9eaa88c7
      Linus Torvalds authored
      Pull libata fix from Damien Le Moal:
       "A single fix for this cycle:
      
         - Check that ATA16 passthrough commands that do not transfer any data
           have a DMA direction set to DMA_NONE (From George)"
      
      * tag 'libata-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
        libata: if T_LENGTH is zero, dma direction should be DMA_NONE
      9eaa88c7
    • Linus Torvalds's avatar
      Merge tag 'zonefs-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs · 1887bf5c
      Linus Torvalds authored
      Pull zonefs fixes from Damien Le Moal:
       "One fix and one trivial update for rc6:
      
         - Add MODULE_ALIAS_FS to get automatic module loading on mount
           (Naohiro)
      
         - Update Damien's email address in the MAINTAINERS file (me)"
      
      * tag 'zonefs-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs:
        MAITAINERS: Change zonefs maintainer email address
        zonefs: add MODULE_ALIAS_FS
      1887bf5c