The patch titled
Subject: hfsplus: prevent btree data loss on root split
has been added to the -mm tree. Its filename is
hfsplus-prevent-btree-data-loss-on-root-split.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/hfsplus-prevent-btree-data-loss-on-root-split.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/hfsplus-prevent-btree-data-loss-on-root-split.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
Binary file patches/hfsplus-prevent-btree-data-loss-on-root-split.patch matches
Subject: hfsplus: prevent btree data loss on root split
Creating, renaming or deleting a file may cause catalog corruption and
data loss. This bug is randomly triggered by xfstests generic/027, but
here is a faster reproducer:
truncate -s 50M fs.iso
mkfs.hfsplus fs.iso
mount fs.iso /mnt
i=100
while [ $i -le 150 ]; do
touch /mnt/$i &>/dev/null
((++i))
done
i=100
while [ $i -le 150 ]; do
mv /mnt/$i /mnt/$(perl -e "print $i x82") &>/dev/null
((++i))
done
umount /mnt
fsck.hfsplus -n fs.iso
The bug is triggered whenever hfs_brec_update_parent() needs to split the
root node. The height of the btree is not increased, which leaves the new
node orphaned and its records lost.
Link: http://lkml.kernel.org/r/26d882184fc43043a810114258f45277752186c7.1535682461.git.ernesto.mnd.fernandez@xxxxxxxxx
Signed-off-by: Ernesto A. Fern�ez <ernesto.mnd.fernandez@xxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN fs/hfsplus/brec.c~hfsplus-prevent-btree-data-loss-on-root-split fs/hfsplus/brec.c
--- a/fs/hfsplus/brec.c~hfsplus-prevent-btree-data-loss-on-root-split
+++ a/fs/hfsplus/brec.c
@@ -429,6 +429,10 @@ skip:
if (new_node) {
__be32 cnid;
+ if (!new_node->parent) {
+ hfs_btree_inc_height(tree);
+ new_node->parent = tree->root;
+ }
fd->bnode = hfs_bnode_find(tree, new_node->parent);
/* create index key and entry */
hfs_bnode_read_key(new_node, fd->search_key, 14);
_
Patches currently in -mm which might be from ernesto.mnd.fernandez@xxxxxxxxx are
