Skip to content

Commit 04065c1

Browse files
committed
Merge tag 'fs.mount.propagation.fix.v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping
Pull mount propagation fix from Christian Brauner: "The propagate_mnt() function handles mount propagation when creating mounts and propagates the source mount tree @source_mnt to all applicable nodes of the destination propagation mount tree headed by @dest_mnt. Unfortunately it contains a bug where it fails to terminate at peers of @source_mnt when looking up copies of the source mount that become masters for copies of the source mount tree mounted on top of slaves in the destination propagation tree causing a NULL dereference. This fixes that bug (with a long commit message for a seven character fix but hopefully it'll help us fix issues faster in the future rather than having to go through the pain of having to relearn everything once more)" * tag 'fs.mount.propagation.fix.v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping: pnode: terminate at peers of source
2 parents d264dd3 + 11933cf commit 04065c1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/pnode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ static int propagate_one(struct mount *m)
244244
}
245245
do {
246246
struct mount *parent = last_source->mnt_parent;
247-
if (last_source == first_source)
247+
if (peers(last_source, first_source))
248248
break;
249249
done = parent->mnt_master == p;
250250
if (done && peers(n, parent))

0 commit comments

Comments
 (0)