# git rev-parse -q --verify 2ef5971ff345d3c000873725db555085e0131961^{commit} 2ef5971ff345d3c000873725db555085e0131961 already have revision, skipping fetch # git checkout -q -f -B kisskb 2ef5971ff345d3c000873725db555085e0131961 # git clean -qxdf # < git log -1 # commit 2ef5971ff345d3c000873725db555085e0131961 # Merge: 83a7eefedc9b f5ceb1bbc98c # Author: Linus Torvalds # Date: Tue Jun 11 12:04:21 2024 -0700 # # Merge tag 'vfs-6.10-rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs # # Pull vfs fixes from Christian Brauner: # "Misc: # - Restore debugfs behavior of ignoring unknown mount options # - Fix kernel doc for netfs_wait_for_oustanding_io() # - Fix struct statx comment after new addition for this cycle # - Fix a check in find_next_fd() # # iomap: # - Fix data zeroing behavior when an extent spans the block that # contains i_size # - Restore i_size increasing in iomap_write_end() for now to avoid # stale data exposure on xfs with a realtime device # # Cachefiles: # - Remove unneeded fdtable.h include # - Improve trace output for cachefiles_obj_{get,put}_ondemand_fd() # - Remove requests from the request list to prevent accessing already # freed requests # - Fix UAF when issuing restore command while the daemon is still # alive by adding an additional reference count to requests # - Fix UAF by grabbing a reference during xarray lookup with xa_lock() # held # - Simplify error handling in cachefiles_ondemand_daemon_read() # - Add consistency checks read and open requests to avoid crashes # - Add a spinlock to protect ondemand_id variable which is used to # determine whether an anonymous cachefiles fd has already been # closed # - Make on-demand reads killable allowing to handle broken cachefiles # daemon better # - Flush all requests after the kernel has been marked dead via # CACHEFILES_DEAD to avoid hung-tasks # - Ensure that closed requests are marked as such to avoid reusing # them with a reopen request # - Defer fd_install() until after copy_to_user() succeeded and thereby # get rid of having to use close_fd() # - Ensure that anonymous cachefiles on-demand fds are reused while # they are valid to avoid pinning already freed cookies" # # * tag 'vfs-6.10-rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: # iomap: Fix iomap_adjust_read_range for plen calculation # iomap: keep on increasing i_size in iomap_write_end() # cachefiles: remove unneeded include of # fs/file: fix the check in find_next_fd() # cachefiles: make on-demand read killable # cachefiles: flush all requests after setting CACHEFILES_DEAD # cachefiles: Set object to close if ondemand_id < 0 in copen # cachefiles: defer exposing anon_fd until after copy_to_user() succeeds # cachefiles: never get a new anonymous fd if ondemand_id is valid # cachefiles: add spin_lock for cachefiles_ondemand_info # cachefiles: add consistency check for copen/cread # cachefiles: remove err_put_fd label in cachefiles_ondemand_daemon_read() # cachefiles: fix slab-use-after-free in cachefiles_ondemand_daemon_read() # cachefiles: fix slab-use-after-free in cachefiles_ondemand_get_fd() # cachefiles: remove requests from xarray during flushing requests # cachefiles: add output string to cachefiles_obj_[get|put]_ondemand_fd # statx: Update offset commentary for struct statx # netfs: fix kernel doc for nets_wait_for_outstanding_io() # debugfs: continue to ignore unknown mount options # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 2ef5971ff345d3c000873725db555085e0131961 # make -s -j 24 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- defconfig # < make -s -j 24 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 24 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 24 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- Completed OK # rm -rf /kisskb/build/linus_defconfig_m68k-gcc13 # Build took: 0:04:23.256865