From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Jul 2025 23:17:44 +0000 (-0700)
Subject: Merge tag 'hfs-v6.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/vdubeyko/hfs
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb6bbff7e6fb263dd739514b3f5dfdcd8eaa9836;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'hfs-v6.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/vdubeyko/hfs

Pull hfs/hfsplus updates from Viacheslav Dubeyko:
 "Johannes Thumshirn has made nice cleanup in hfsplus_submit_bio().

  Tetsuo Handa has fixed the syzbot reported issue in
  hfsplus_create_attributes_file() for the case of corruption the
  Attributes File's metadata.

  Yangtao Li has fixed the syzbot reported issue by removing the
  uneccessary WARN_ON() in hfsplus_free_extents().

  Other fixes:

   - restore generic/001 successful execution by erasing deleted b-tree
     nodes

   - eliminate slab-out-of-bounds issue in hfs_bnode_read() and
     hfsplus_bnode_read() by checking correctness of offset and length
     when accessing b-tree node contents

   - eliminate slab-out-of-bounds read in hfsplus_uni2asc() if the
     b-tree node record has corrupted length of a name that could be
     bigger than HFSPLUS_MAX_STRLEN

   - eliminate general protection fault in hfs_find_init() for the case
     of initial b-tree object creation"

* tag 'hfs-v6.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/vdubeyko/hfs:
  hfs: fix general protection fault in hfs_find_init()
  hfs: fix slab-out-of-bounds in hfs_bnode_read()
  hfsplus: fix slab-out-of-bounds in hfsplus_bnode_read()
  hfsplus: fix slab-out-of-bounds read in hfsplus_uni2asc()
  hfsplus: don't use BUG_ON() in hfsplus_create_attributes_file()
  hfsplus: don't set REQ_SYNC for hfsplus_submit_bio()
  hfsplus: remove mutex_lock check in hfsplus_free_extents
  hfs: make splice write available again
  hfsplus: make splice write available again
  hfs: fix not erasing deleted b-tree node issue
---

cb6bbff7e6fb263dd739514b3f5dfdcd8eaa9836
diff --cc fs/hfs/inode.c
index 03b9d1523acf1,451115360f73a..bf4cb7e78396b
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@@ -690,8 -690,9 +690,9 @@@ static const struct file_operations hfs
  	.llseek		= generic_file_llseek,
  	.read_iter	= generic_file_read_iter,
  	.write_iter	= generic_file_write_iter,
 -	.mmap		= generic_file_mmap,
 +	.mmap_prepare	= generic_file_mmap_prepare,
  	.splice_read	= filemap_splice_read,
+ 	.splice_write	= iter_file_splice_write,
  	.fsync		= hfs_file_fsync,
  	.open		= hfs_file_open,
  	.release	= hfs_file_release,
diff --cc fs/hfsplus/inode.c
index 9d5c82b2dc41d,c85b5802ec0f9..b51a411ecd237
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@@ -368,8 -366,9 +368,9 @@@ static const struct file_operations hfs
  	.llseek		= generic_file_llseek,
  	.read_iter	= generic_file_read_iter,
  	.write_iter	= generic_file_write_iter,
 -	.mmap		= generic_file_mmap,
 +	.mmap_prepare	= generic_file_mmap_prepare,
  	.splice_read	= filemap_splice_read,
+ 	.splice_write	= iter_file_splice_write,
  	.fsync		= hfsplus_file_fsync,
  	.open		= hfsplus_file_open,
  	.release	= hfsplus_file_release,