Skip to content

Commit c84e125

Browse files
kovalev0brauner
authored andcommitted
ovl: fix UAF in ovl_dentry_update_reval by moving dput() in ovl_link_up
The issue was caused by dput(upper) being called before ovl_dentry_update_reval(), while upper->d_flags was still accessed in ovl_dentry_remote(). Move dput(upper) after its last use to prevent use-after-free. BUG: KASAN: slab-use-after-free in ovl_dentry_remote fs/overlayfs/util.c:162 [inline] BUG: KASAN: slab-use-after-free in ovl_dentry_update_reval+0xd2/0xf0 fs/overlayfs/util.c:167 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:114 print_address_description mm/kasan/report.c:377 [inline] print_report+0xc3/0x620 mm/kasan/report.c:488 kasan_report+0xd9/0x110 mm/kasan/report.c:601 ovl_dentry_remote fs/overlayfs/util.c:162 [inline] ovl_dentry_update_reval+0xd2/0xf0 fs/overlayfs/util.c:167 ovl_link_up fs/overlayfs/copy_up.c:610 [inline] ovl_copy_up_one+0x2105/0x3490 fs/overlayfs/copy_up.c:1170 ovl_copy_up_flags+0x18d/0x200 fs/overlayfs/copy_up.c:1223 ovl_rename+0x39e/0x18c0 fs/overlayfs/dir.c:1136 vfs_rename+0xf84/0x20a0 fs/namei.c:4893 ... </TASK> Fixes: b07d5cc ("ovl: update of dentry revalidate flags after copy up") Reported-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=316db8a1191938280eb6 Signed-off-by: Vasiliy Kovalev <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Amir Goldstein <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent b8d975e commit c84e125

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/overlayfs/copy_up.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,14 +618,14 @@ static int ovl_link_up(struct ovl_copy_up_ctx *c)
618618
err = PTR_ERR(upper);
619619
if (!IS_ERR(upper)) {
620620
err = ovl_do_link(ofs, ovl_dentry_upper(c->dentry), udir, upper);
621-
dput(upper);
622621

623622
if (!err) {
624623
/* Restore timestamps on parent (best effort) */
625624
ovl_set_timestamps(ofs, upperdir, &c->pstat);
626625
ovl_dentry_set_upper_alias(c->dentry);
627626
ovl_dentry_update_reval(c->dentry, upper);
628627
}
628+
dput(upper);
629629
}
630630
inode_unlock(udir);
631631
if (err)

0 commit comments

Comments
 (0)