Skip to content
Snippets Groups Projects
  1. Jul 19, 2021
  2. Jul 18, 2021
  3. Jul 16, 2021
  4. Jul 14, 2021
    • Theodore Ts'o's avatar
      ext4: fix possible UAF when remounting r/o a mmp-protected file system · 7d7d26aa
      Theodore Ts'o authored
      mainline inclusion
      from mainline-5.14
      commit	61bb4a1c417e5b95d9edb4f887f131de32e419cb
      category: bugfix
      bugzilla: 173880
      CVE: NA
      
      -------------------------------------------------
      
      After commit 618f003199c6 ("ext4: fix memory leak in
      ext4_fill_super"), after the file system is remounted read-only, there
      is a race where the kmmpd thread can exit, causing sbi->s_mmp_tsk to
      point at freed memory, which the call to ext4_stop_mmpd() can trip
      over.
      
      Fix this by only allowing kmmpd() to exit when it is stopped via
      ext4_stop_mmpd().
      
      Link: https://lore.kernel.org/r/20210707002433.3719773-1-tytso@mit.edu
      
      
      Reported-by: default avatarYe Bin <yebin10@huawei.com>
      Bug-Report-Link: <20210629143603.2166962-1-yebin10@huawei.com>
      Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
      Reviewed-by: default avatarJan Kara <jack@suse.cz>
      
      Conflicts:
      	fs/ext4/super.c
      
      Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
      Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
      Signed-off-by: Yang Yingliang <yangying...
      7d7d26aa
    • Luo Meng's avatar
      locks: Fix UBSAN undefined behaviour in flock64_to_posix_lock · 1b84bd6f
      Luo Meng authored
      mainline inclusion
      from mainline-v5.11-rc1
      commit 16238415eb9886328a89fe7a3cb0b88c7335fe16
      category: bugfix
      bugzilla: 38689
      CVE: NA
      
      -----------------------------------------------
      
      When the sum of fl->fl_start and l->l_len overflows,
      UBSAN shows the following warning:
      
      UBSAN: Undefined behaviour in fs/locks.c:482:29
      signed integer overflow: 2 + 9223372036854775806
      cannot be represented in type 'long long int'
      Call Trace:
       __dump_stack lib/dump_stack.c:77 [inline]
       dump_stack+0xe4/0x14e lib/dump_stack.c:118
       ubsan_epilogue+0xe/0x81 lib/ubsan.c:161
       handle_overflow+0x193/0x1e2 lib/ubsan.c:192
       flock64_to_posix_lock fs/locks.c:482 [inline]
       flock_to_posix_lock+0x595/0x690 fs/locks.c:515
       fcntl_setlk+0xf3/0xa90 fs/locks.c:2262
       do_fcntl+0x456/0xf60 fs/fcntl.c:387
       __do_sys_fcntl fs/fcntl.c:483 [inline]
       __se_sys_fcntl fs/fcntl.c:468 [inline]
       __x64_sys_fcntl+0x12d/0x180 fs/fcntl.c:468
       do_syscall_64+0xc8/0x5a0 arch/x86/entry/common.c:293
       entry_SY...
      1b84bd6f
    • Matthew Wilcox (Oracle)'s avatar
      iomap: Mark read blocks uptodate in write_begin · a259beb0
      Matthew Wilcox (Oracle) authored
      
      mainline inclusion
      from mainline-v5.10
      commit 14284fed
      category: bugfix
      bugzilla: 43547
      CVE: NA
      
      -----------------------------------------------
      
      When bringing (portions of) a page uptodate, we were marking blocks that
      were zeroed as being uptodate, but not blocks that were read from storage.
      
      Like the previous commit, this problem was found with generic/127 and
      a kernel which failed readahead I/Os.  This bug causes writes to be
      silently lost when working with flaky storage.
      
      Fixes: 9dc55f13 ("iomap: add support for sub-pagesize buffered I/O without buffer heads")
      Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
      Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
      Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      
      conflicts:
      fs/iomap.c
      
      Signed-off-by: default avatarYe Bin <yebin10@huawei.com>
      Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
      Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
      a259beb0
    • Matthew Wilcox (Oracle)'s avatar
      iomap: Clear page error before beginning a write · b3a0aab5
      Matthew Wilcox (Oracle) authored
      mainline inclusion
      from mainline-v5.10-rc1
      commit e6e7ca92
      category: bugfix
      bugzilla: 43551
      CVE: NA
      
      -----------------------------------------------
      
      If we find a page in write_begin which is !Uptodate, we need
      to clear any error on the page before starting to read data
      into it.  This matches how filemap_fault(), do_read_cache_page()
      and generic_file_buffered_read() handle PageError on !Uptodate pages.
      When calling iomap_set_range_uptodate() in __iomap_write_begin(), blocks
      were not being marked as uptodate.
      
      This was found with generic/127 and a specially modified kernel which
      would fail (some) readahead I/Os.  The test read some bytes in a prior
      page which caused readahead to extend into page 0x34.  There was
      a subsequent write to page 0x34, followed by a read to page 0x34.
      Because the blocks were still marked as !Uptodate, the read caused all
      blocks to be re-read, overwriting the write.  With this change, and the
      next one,...
      b3a0aab5
    • Christoph Hellwig's avatar
      iomap: move the zeroing case out of iomap_read_page_sync · 9fdbab15
      Christoph Hellwig authored
      
      mainline inclusion
      from mainline-v5.5-rc1
      commit d3b40439
      category: bugfix
      bugzilla: 43551
      CVE: NA
      
      -----------------------------------------------
      
      That keeps the function a little easier to understand, and easier to
      modify for pending enhancements.
      
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
      Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
      
      conflicts:
      fs/iomap.c
      
      Signed-off-by: default avatarYe Bin <yebin10@huawei.com>
      Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
      Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
      9fdbab15
    • Josef Bacik's avatar
      nbd: handle device refs for DESTROY_ON_DISCONNECT properly · c72b1648
      Josef Bacik authored
      mainline inclusion
      from mainline-5.12-rc1
      commit c9a2f90f4d6b
      category: bugfix
      bugzilla: 50455
      CVE: NA
      
      -------------------------------------------------
      
      There exists a race where we can be attempting to create a new nbd
      configuration while a previous configuration is going down, both
      configured with DESTROY_ON_DISCONNECT.  Normally devices all have a
      reference of 1, as they won't be cleaned up until the module is torn
      down.  However with DESTROY_ON_DISCONNECT we'll make sure that there is
      only 1 reference (generally) on the device for the config itself, and
      then once the config is dropped, the device is torn down.
      
      The race that exists looks like this
      
      TASK1					TASK2
      nbd_genl_connect()
        idr_find()
          refcount_inc_not_zero(nbd)
            * count is 2 here ^^
      					nbd_config_put()
      					  nbd_put(nbd) (count is 1)
          setup new config
            check DESTROY_ON_DISCONNECT
      	put_dev = true
          if (put_dev) nbd_put(nbd)
      	* free'd here ^^
      
      In nbd_genl_conne...
      c72b1648
    • Paul Aurich's avatar
      cifs: Fix leak when handling lease break for cached root fid · 25ebc65f
      Paul Aurich authored
      mainline inclusion
      from mainline-5.9-rc1
      commit baf57b56
      category: bugfix
      bugzilla: 40791
      CVE: NA
      
      ---------------------------
      
      Handling a lease break for the cached root didn't free the
      smb2_lease_break_work allocation, resulting in a leak:
      
          unreferenced object 0xffff98383a5af480 (size 128):
            comm "cifsd", pid 684, jiffies 4294936606 (age 534.868s)
            hex dump (first 32 bytes):
              c0 ff ff ff 1f 00 00 00 88 f4 5a 3a 38 98 ff ff  ..........Z:8...
              88 f4 5a 3a 38 98 ff ff 80 88 d6 8a ff ff ff ff  ..Z:8...........
            backtrace:
              [<0000000068957336>] smb2_is_valid_oplock_break+0x1fa/0x8c0
              [<0000000073b70b9e>] cifs_demultiplex_thread+0x73d/0xcc0
              [<00000000905fa372>] kthread+0x11c/0x150
              [<0000000079378e4e>] ret_from_fork+0x22/0x30
      
      Avoid this leak by only allocating when necessary.
      
      Fixes: a93864d9 ("cifs: add lease tracking to the cached root fid")
      Signed-o...
      25ebc65f
  5. Jul 12, 2021
  6. Jul 09, 2021
  7. Jul 08, 2021
    • 王海's avatar
      usb: gadget: rndis: Fix info leak of rndis · 7f1196b6
      王海 authored
      hulk inclusion
      category: bugfix
      bugzilla: 172330
      CVE: NA
      
      --------------------------------
      
      We can construct some special USB packets that cause kernel
      info leak by the following steps of rndis.
      
      1. construct the packet to make rndis call gen_ndis_set_resp().
      
      In gen_ndis_set_resp(), BufOffset comes from the USB packet and
      it is not checked so that BufOffset can be any value. Therefore,
      if OID is RNDIS_OID_GEN_CURRENT_PACKET_FILTER, then *params->filter
      can get data at any address.
      
      2. construct the packet to make rndis call rndis_query_response().
      
      In rndis_query_response(), if OID is RNDIS_OID_GEN_CURRENT_PACKET_FILTER,
      then the data of *params->filter is fetched and returned, resulting in
      info leak.
      
      Therefore, we need to check the BufOffset to prevent info leak. Here,
      buf size is USB_COMP_EP0_BUFSIZ, as long as "8 + BufOffset + BufLength"
      is less than USB_COMP_EP0_BUFSIZ, it will be considered legal.
      
      Fixes: 1da177e4 ("Linux-2.6.12-rc2")
      Signed-off-by: Wa...
      7f1196b6
  8. Jul 05, 2021
    • 王克锋's avatar
      once: Fix panic when module unload · 23eb8e37
      王克锋 authored
      hulk inclusion
      category: bugfix
      bugzilla: 172153
      CVE: NA
      
      -------------------------------------------------
      
      DO_ONCE
      DEFINE_STATIC_KEY_TRUE(___once_key);
      __do_once_done
        once_disable_jump(once_key);
          INIT_WORK(&w->work, once_deferred);
          struct once_work *w;
          w->key = key;
          schedule_work(&w->work);                     module unload
                                                         //*the key is destroy*
      process_one_work
        once_deferred
          BUG_ON(!static_key_enabled(work->key));
             static_key_count((struct static_key *)x)    //*access key, crash*
      
      When module uses DO_ONCE mechanism, it could crash due to the above
      concurrency problem, we could reproduce it with link[1].
      
      Fix it by add/put module refcount in the once work process.
      
      [1]
      https://lore.kernel.org/netdev/eaa6c371-465e-57eb-6be9-f4b16b9d7cbf@huawei.com/
      
      Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
      Cc: Daniel Borkmann <daniel@iogearbox.net>
      Cc: David S. Miller <davem@davemloft.net>
      Cc:...
    • Zhang Xiaoxu's avatar
      SUNRPC: Should wake up the privileged task firstly. · 3d5dba2f
      Zhang Xiaoxu authored
      
      mainline inclusion
      from mainline-v5.14
      commit 5483b904bf336948826594610af4c9bbb0d9e3aa
      category: bugfix
      bugzilla: 51898
      CVE: NA
      
      ---------------------------
      
      When find a task from wait queue to wake up, a non-privileged task may
      be found out, rather than the privileged. This maybe lead a deadlock
      same as commit dfe1fe75e00e ("NFSv4: Fix deadlock between nfs4_evict_inode()
      and nfs4_opendata_get_inode()"):
      
      Privileged delegreturn task is queued to privileged list because all
      the slots are assigned. If there has no enough slot to wake up the
      non-privileged batch tasks(session less than 8 slot), then the privileged
      delegreturn task maybe lost waked up because the found out task can't
      get slot since the session is on draining.
      
      So we should treate the privileged task as the emergency task, and
      execute it as for as we can.
      
      Reported-by: default avatarHulk Robot <hulkci@huawei.com>
      Fixes: 5fcdfacc ("NFSv4: Return delegations synchronously in evict_inode")
      Cc: stable@vger...
      3d5dba2f
    • Zhang Xiaoxu's avatar
      SUNRPC: Fix the batch tasks count wraparound. · 9b06b695
      Zhang Xiaoxu authored
      
      mainline inclusion
      from mainline-v5.14
      commit fcb170a9d825d7db4a3fb870b0300f5a40a8d096
      category: bugfix
      bugzilla: 51898
      CVE: NA
      
      ---------------------------
      
      The 'queue->nr' will wraparound from 0 to 255 when only current
      priority queue has tasks. This maybe lead a deadlock same as commit
      dfe1fe75e00e ("NFSv4: Fix deadlock between nfs4_evict_inode()
      and nfs4_opendata_get_inode()"):
      
      Privileged delegreturn task is queued to privileged list because all
      the slots are assigned. When non-privileged task complete and release
      the slot, a non-privileged maybe picked out. It maybe allocate slot
      failed when the session on draining.
      
      If the 'queue->nr' has wraparound to 255, and no enough slot to
      service it, then the privileged delegreturn will lost to wake up.
      
      So we should avoid the wraparound on 'queue->nr'.
      
      Reported-by: default avatarHulk Robot <hulkci@huawei.com>
      Fixes: 5fcdfacc ("NFSv4: Return delegations synchronously in evict_inode")
      Fixes: 1da177e4 ("Linux-2.6.12-rc2")
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarZhang Xiaoxu <zhangxiaoxu5@huawei.com>
      Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
      Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
      Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
      9b06b695
    • Daniel Borkmann's avatar
      bpf: Fix leakage under speculation on mispredicted branches · 78d76ae7
      Daniel Borkmann authored
      mainline inclusion
      from mainline-v5.13-rc7
      commit 9183671af6dbf60a1219371d4ed73e23f43b49db
      category: bugfix
      bugzilla: NA
      CVE: CVE-2021-33624
      
      --------------------------------
      
      The verifier only enumerates valid control-flow paths and skips paths that
      are unreachable in the non-speculative domain. And so it can miss issues
      under speculative execution on mispredicted branches.
      
      For example, a type confusion has been demonstrated with the following
      crafted program:
      
        // r0 = pointer to a map array entry
        // r6 = pointer to readable stack slot
        // r9 = scalar controlled by attacker
        1: r0 = *(u64 *)(r0) // cache miss
        2: if r0 != 0x0 goto line 4
        3: r6 = r9
        4: if r0 != 0x1 goto line 6
        5: r9 = *(u8 *)(r6)
        6: // leak r9
      
      Since line 3 runs iff r0 == 0 and line 5 runs iff r0 == 1, the verifier
      concludes that the pointer dereference on line 5 is safe. But: if the
      attacker trains both the branches to fall-through, such that the following
      is spe...
      78d76ae7
    • Daniel Borkmann's avatar
      bpf: Do not mark insn as seen under speculative path verification · b2fdc6d8
      Daniel Borkmann authored
      
      mainline inclusion
      from mainline-v5.13-rc7
      commit fe9a5ca7e370e613a9a75a13008a3845ea759d6e
      category: bugfix
      bugzilla: NA
      CVE: CVE-2021-33624
      
      --------------------------------
      
      ... in such circumstances, we do not want to mark the instruction as seen given
      the goal is still to jmp-1 rewrite/sanitize dead code, if it is not reachable
      from the non-speculative path verification. We do however want to verify it for
      safety regardless.
      
      With the patch as-is all the insns that have been marked as seen before the
      patch will also be marked as seen after the patch (just with a potentially
      different non-zero count). An upcoming patch will also verify paths that are
      unreachable in the non-speculative domain, hence this extension is needed.
      
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Reviewed-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
      Reviewed-by: default avatarBenedict Schlueter <benedict.schlueter@rub.de>
      Reviewed-by: default avatarPiotr Krysiuk <piotras@gmail.com>
      Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
      
      Conflicts:
        kernel/bpf/verifier.c
      
      pass_cnt is not introduced in kernel-4.19.
      
      Signed-off-by: default avatarHe Fengqing <hefengqing@huawei.com>
      Reviewed-by: default avatarKuohai Xu <xukuohai@huawei.com>
      Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
      Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
      b2fdc6d8
    • Daniel Borkmann's avatar
      bpf: Inherit expanded/patched seen count from old aux data · 9d1b583d
      Daniel Borkmann authored
      
      mainline inclusion
      from mainline-v5.13-rc7
      commit d203b0fd863a2261e5d00b97f3d060c4c2a6db71
      category: bugfix
      bugzilla: NA
      CVE: CVE-2021-33624
      
      --------------------------------
      
      Instead of relying on current env->pass_cnt, use the seen count from the
      old aux data in adjust_insn_aux_data(), and expand it to the new range of
      patched instructions. This change is valid given we always expand 1:n
      with n>=1, so what applies to the old/original instruction needs to apply
      for the replacement as well.
      
      Not relying on env->pass_cnt is a prerequisite for a later change where we
      want to avoid marking an instruction seen when verified under speculative
      execution path.
      
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Reviewed-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
      Reviewed-by: default avatarBenedict Schlueter <benedict.schlueter@rub.de>
      Reviewed-by: default avatarPiotr Krysiuk <piotras@gmail.com>
      Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
      
      Conflicts:
        kernel/bpf/verifier.c
      
      seen of bpf_insn_aux_data is bool in kernel-4.19.
      
      Signed-off-by: default avatarHe Fengqing <hefengqing@huawei.com>
      Reviewed-by: default avatarKuohai Xu <xukuohai@huawei.com>
      Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
      Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
      9d1b583d
    • Daniel Borkmann's avatar
      bpf: Update selftests to reflect new error states · 040bd002
      Daniel Borkmann authored
      
      stable inclusion
      from linux-4.19.193
      commit 138b0ec1064c8f154a32297458e562591a94773f
      
      --------------------------------
      
      commit d7a5091351756d0ae8e63134313c455624e36a13 upstream
      
      Update various selftest error messages:
      
       * The 'Rx tried to sub from different maps, paths, or prohibited types'
         is reworked into more specific/differentiated error messages for better
         guidance.
      
       * The change into 'value -4294967168 makes map_value pointer be out of
         bounds' is due to moving the mixed bounds check into the speculation
         handling and thus occuring slightly later than above mentioned sanity
         check.
      
       * The change into 'math between map_value pointer and register with
         unbounded min value' is similarly due to register sanity check coming
         before the mixed bounds check.
      
       * The case of 'map access: known scalar += value_ptr from different maps'
         now loads fine given masks are the same from the different paths (despite
         max map value size being different).
      
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Reviewed-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
      Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
      [OP: 4.19 backport, account for split test_verifier and
      different / missing tests]
      Signed-off-by: default avatarOvidiu Panait <ovidiu.panait@windriver.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
      040bd002