Simon Gander
ec2c054e87
hfsplus: fix crash and filesystem corruption when deleting files ...
commit 25efb2ffdf991177e740b2f63e92b4ec7d310a92 upstream.
When removing files containing extended attributes, the hfsplus driver may
remove the wrong entries from the attributes b-tree, causing major
filesystem damage and in some cases even kernel crashes.
To remove a file, all its extended attributes have to be removed as well.
The driver does this by looking up all keys in the attributes b-tree with
the cnid of the file. Each of these entries then gets deleted using the
key used for searching, which doesn't contain the attribute's name when it
should. Since the key doesn't contain the name, the deletion routine will
not find the correct entry and instead remove the one in front of it. If
parent nodes have to be modified, these become corrupt as well. This
causes invalid links and unsorted entries that not even macOS's fsck_hfs
is able to fix.
To fix this, modify the search key before an entry is deleted from the
attributes b-tree by copying the found entry's key into the search key,
therefore ensuring that the correct entry gets removed from the tree.
Signed-off-by: Simon Gander <simon@tuxera.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Anton Altaparmakov <anton@tuxera.com>
Cc: <stable@vger.kernel.org>
Link: http://lkml.kernel.org/r/20200327155541.1521-1-simon@tuxera.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2020-04-17 10:50:22 +02:00
9p pull request for inclusion in 5.4
2019-09-27 15:10:34 -07:00
Merge branch 'work.adfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 11:33:22 -07:00
affs: fix a memory leak in affs_remount
2020-01-17 19:48:50 +01:00
rxrpc: Fix call interruptibility handling
2020-04-17 10:49:57 +02:00
autofs: fix a leak in autofs_expire_indirect()
2019-10-25 00:03:11 -04:00
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
btrfs: use nofs allocations for running delayed items
2020-04-17 10:50:15 +02:00
ceph: canonicalize server path in place
2020-04-13 10:48:11 +02:00
CIFS: Fix bug which the return value by asynchronous read is error
2020-04-17 10:50:14 +02:00
y2038: add inode timestamp clamping
2019-09-19 09:42:37 -07:00
utimes: Clamp the timestamps in notify_change()
2020-02-11 04:35:12 -08:00
cramfs: fix usage on non-MTD device
2019-11-23 21:44:49 -05:00
fscrypt: don't evict dirty inodes after removing key
2020-03-18 07:17:53 +01:00
debugfs: Check module state before warning in {full/open}_proxy_open()
2020-04-17 10:50:02 +02:00
devpts_pty_kill(): don't bother with d_delete()
2019-09-03 09:30:56 -04:00
ecryptfs: replace BUG_ON with error handling code
2020-02-28 17:22:26 +01:00
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
erofs: correct the remaining shrink objects
2020-04-17 10:50:16 +02:00
exportfs_decode_fh(): negative pinned may become positive without the parent locked
2019-11-10 11:56:05 -05:00
ext2: Adjust indentation in ext2_fill_super
2020-02-11 04:35:45 -08:00
ext4: fix a data race at inode->i_blocks
2020-04-17 10:50:21 +02:00
f2fs: fix to add swap extent correctly
2020-03-05 16:43:48 +01:00
fat: fix uninit-memory access for partial initialized inode
2020-03-12 13:00:19 +01:00
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
fuse: fix stack use after return
2020-03-18 07:17:52 +01:00
gfs2: Don't demote a glock until its revokes are written
2020-04-17 10:50:03 +02:00
hfsplus: fix crash and filesystem corruption when deleting files
2020-04-17 10:50:22 +02:00
fs: hpfs: Initialize filesystem timestamp ranges
2019-08-30 08:11:25 -07:00
mm/hugetlbfs: fix for_each_hstate() loop in init_hugetlbfs_fs()
2020-01-04 19:19:19 +01:00
iomap: fix return value of iomap_dio_bio_actor on 32bit systems
2020-01-04 19:17:31 +01:00
y2038: add inode timestamp clamping
2019-09-19 09:42:37 -07:00
jbd2: fix data races at struct journal_head
2020-03-21 08:11:57 +01:00
Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()"
2019-12-04 22:31:06 +01:00
y2038: add inode timestamp clamping
2019-09-19 09:42:37 -07:00
kernfs: fix ino wrap-around detection
2019-12-13 08:42:53 +01:00
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
NFS: Fix a page leak in nfs_destroy_unlinked_subrequests()
2020-04-17 10:50:20 +02:00
nfsd: fsnotify on rmdir under nfsd/clients/
2020-04-17 10:50:20 +02:00
fs: call fsnotify_sb_delete after evict_inodes
2020-01-12 12:21:38 +01:00
utimes: Clamp the timestamps in notify_change()
2020-02-11 04:35:12 -08:00
ocfs2: no need try to truncate file beyond i_size
2020-04-17 10:50:21 +02:00
fs: omfs: Initialize filesystem timestamp ranges
2019-08-30 08:11:25 -07:00
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
help_next should increase position index
2020-02-24 08:37:02 +01:00
ovl: fix lseek overflow on 32bit
2020-02-11 04:35:24 -08:00
proc/meminfo: fix output alignment
2019-10-19 06:32:32 -04:00
pstore: pstore_ftrace_seq_next should increase position index
2020-04-17 10:50:12 +02:00
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
fs: Fill in max and min timestamps in superblock
2019-08-30 07:27:17 -07:00
fs: avoid softlockups in s_inodes iterators
2020-01-12 12:21:37 +01:00
vfs: Convert ramfs, shmem, tmpfs, devtmpfs, rootfs to use the new mount API
2019-09-12 21:05:34 -04:00
reiserfs: prevent NULL pointer dereference in reiserfs_insert_item()
2020-02-24 08:37:00 +01:00
Merge branch 'work.mount2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-09-19 10:06:57 -07:00
Merge branch 'work.mount2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-09-19 10:06:57 -07:00
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
fs: sysv: Initialize filesystem timestamp ranges
2019-08-30 07:27:18 -07:00
tracing: Do not create tracefs files if tracefs lockdown is in effect
2019-10-12 20:49:07 -04:00
ubifs: Fix ino_t format warnings in orphan_delete()
2020-03-05 16:43:50 +01:00
udf: Fix free space reporting for metadata and virtual partitions
2020-02-24 08:36:44 +01:00
y2038: add inode timestamp clamping
2019-09-19 09:42:37 -07:00
unicode: make array 'token' static const, makes object smaller
2019-09-17 11:48:24 -04:00
fs-verity: support builtin file signatures
2019-08-12 19:33:50 -07:00
xfs: clear kernel only flags in XFS_IOC_ATTRMULTI_BY_HANDLE
2020-03-05 16:43:51 +01:00
aio: prevent potential eventfd recursion on poll
2020-02-11 04:35:37 -08:00
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
utimes: Clamp the timestamps in notify_change()
2020-02-11 04:35:12 -08:00
elf: don't use MAP_FIXED_NOREPLACE for elf executable mappings
2019-10-06 13:53:27 -07:00
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
bdev: Refresh bdev size for disks without partitioning
2019-12-13 08:43:19 +01:00
fs: move guard_bio_eod() after bio_set_op_attrs
2020-01-17 19:48:21 +01:00
chardev: Avoid potential use-after-free in 'chrdev_open()'
2020-01-14 20:08:18 +01:00
fix compat handling of FICLONERANGE, FIDEDUPERANGE and FS_IOC_FIEMAP
2020-01-09 10:20:05 +01:00
coredump: split pipe command whitespace before expanding template
2019-08-03 07:02:01 -07:00
[PATCH] fix d_absolute_path() interplay with fsmount()
2019-08-30 19:31:09 -04:00
dax: pass NOWAIT flag to iomap_apply
2020-03-05 16:43:36 +01:00
Merge branch 'work.dcache2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-20 09:15:51 -07:00
fs/direct-io.c: fix kernel-doc warning
2019-10-14 15:04:01 -07:00
fs: avoid softlockups in s_inodes iterators
2020-01-12 12:21:37 +01:00
eventfd: track eventfd_signal() recursion depth
2020-02-11 04:35:37 -08:00
epoll: fix possible lost wakeup on epoll_ctl() path
2020-03-25 08:25:57 +01:00
signal: Extend exec_id to 64bits
2020-04-17 10:50:12 +02:00
fs/handle.c - fix up kerneldoc
2019-08-07 21:51:47 -04:00
vfs: Export flush_delayed_fput for use by knfsd.
2019-08-19 11:00:39 -04:00
fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once()
2020-04-17 10:50:21 +02:00
memcg: fix a crash in wb_workfn when a device disappears
2020-02-11 04:35:11 -08:00
vfs: subtype handling moved to fuse
2019-09-06 21:28:49 +02:00
vfs: Make fs_parse() handle fs_param_is_fd-type params better
2019-09-12 21:06:14 -04:00
switch the remnants of releasing the mountpoint away from fs_pin
2019-07-16 22:52:37 -04:00
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
futex: Fix inode life-time issue
2020-03-25 08:25:58 +01:00
fs: move guard_bio_eod() after bio_set_op_attrs
2020-01-17 19:48:21 +01:00
io_uring: honor original task RLIMIT_FSIZE
2020-04-17 10:50:16 +02:00
compat_ioctl: add compat_ptr_ioctl()
2019-12-17 19:55:30 +01:00
fs-verity for 5.4
2019-09-18 16:59:14 -07:00
libfs: fix infoleak in simple_attr_read()
2020-04-01 11:02:17 +02:00
locks: reinstate locks_delete_block optimization
2020-03-25 08:25:41 +01:00
fs-verity for 5.4
2019-09-18 16:59:14 -07:00
switch the remnants of releasing the mountpoint away from fs_pin
2019-07-16 22:52:37 -04:00
fs: move guard_bio_eod() after bio_set_op_attrs
2020-01-17 19:48:21 +01:00
namei: only return -ECHILD from follow_dotdot_rcu()
2020-03-05 16:43:48 +01:00
fs/namespace.c: fix use-after-free of mount in mnt_warn_timestamp_expiry()
2019-10-16 23:15:09 -04:00
cifs_atomic_open(): fix double-put on late allocation failure
2020-03-18 07:17:51 +01:00
vfs: subtype handling moved to fuse
2019-09-06 21:28:49 +02:00
fs: allow deduplication of eof block into the end of the destination file
2020-02-11 04:35:23 -08:00
readdir: be more conservative with directory entry names
2020-01-29 16:45:31 +01:00
seq_file: fix problem when seeking mid-record
2019-08-13 16:06:52 -07:00
splice: only read in as much information as there is pipe buffer space
2019-12-17 19:56:52 +01:00
vfs: Fix EOVERFLOW testing in put_compat_statfs64
2019-10-03 14:21:35 -07:00
fs: call fsnotify_sb_delete after evict_inodes
2020-01-12 12:21:38 +01:00
timerfd: Prepare for PREEMPT_RT
2019-08-01 20:51:23 +02:00
userfaultfd: require CAP_SYS_PTRACE for UFFD_FEATURE_EVENT_FORK
2020-01-04 19:18:32 +01:00
utimes: Clamp the timestamps in notify_change()
2020-02-11 04:35:12 -08:00
ec2c054e87