Skip to content

Commit 663b88f

Browse files
Wei YangUlrich Hecht
authored andcommitted
fs/proc: fix uaf in proc_readdir_de()
[ Upstream commit 895b4c0c79b092d732544011c3cecaf7322c36a1 ] Pde is erased from subdir rbtree through rb_erase(), but not set the node to EMPTY, which may result in uaf access. We should use RB_CLEAR_NODE() set the erased node to EMPTY, then pde_subdir_next() will return NULL to avoid uaf access. We found an uaf issue while using stress-ng testing, need to run testcase getdent and tun in the same time. The steps of the issue is as follows: 1) use getdent to traverse dir /proc/pid/net/dev_snmp6/, and current pde is tun3; 2) in the [time windows] unregister netdevice tun3 and tun2, and erase them from rbtree. erase tun3 first, and then erase tun2. the pde(tun2) will be released to slab; 3) continue to getdent process, then pde_subdir_next() will return pde(tun2) which is released, it will case uaf access. CPU 0 | CPU 1 ------------------------------------------------------------------------- traverse dir /proc/pid/net/dev_snmp6/ | unregister_netdevice(tun->dev) //tun3 tun2 sys_getdents64() | iterate_dir() | proc_readdir() | proc_readdir_de() | snmp6_unregister_dev() pde_get(de); | proc_remove() read_unlock(&proc_subdir_lock); | remove_proc_subtree() | write_lock(&proc_subdir_lock); [time window] | rb_erase(&root->subdir_node, &parent->subdir); | write_unlock(&proc_subdir_lock); read_lock(&proc_subdir_lock); | next = pde_subdir_next(de); | pde_put(de); | de = next; //UAF | rbtree of dev_snmp6 | pde(tun3) / \ NULL pde(tun2) Link: https://lkml.kernel.org/r/20251025024233.158363-1-albin_yang@163.com Signed-off-by: Wei Yang <albinwyang@tencent.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Christian Brauner <brauner@kernel.org> Cc: wangzijie <wangzijie1@honor.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ulrich Hecht <uli@kernel.org>
1 parent 6ad2888 commit 663b88f

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

fs/proc/generic.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,12 @@ void pde_put(struct proc_dir_entry *pde)
670670
}
671671
}
672672

673+
static void pde_erase(struct proc_dir_entry *pde, struct proc_dir_entry *parent)
674+
{
675+
rb_erase(&pde->subdir_node, &parent->subdir);
676+
RB_CLEAR_NODE(&pde->subdir_node);
677+
}
678+
673679
/*
674680
* Remove a /proc entry and free it if it's not currently in use.
675681
*/
@@ -688,7 +694,7 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent)
688694

689695
de = pde_subdir_find(parent, fn, len);
690696
if (de) {
691-
rb_erase(&de->subdir_node, &parent->subdir);
697+
pde_erase(de, parent);
692698
if (S_ISDIR(de->mode)) {
693699
parent->nlink--;
694700
}
@@ -726,13 +732,13 @@ int remove_proc_subtree(const char *name, struct proc_dir_entry *parent)
726732
write_unlock(&proc_subdir_lock);
727733
return -ENOENT;
728734
}
729-
rb_erase(&root->subdir_node, &parent->subdir);
735+
pde_erase(root, parent);
730736

731737
de = root;
732738
while (1) {
733739
next = pde_subdir_first(de);
734740
if (next) {
735-
rb_erase(&next->subdir_node, &de->subdir);
741+
pde_erase(next, de);
736742
de = next;
737743
continue;
738744
}

0 commit comments

Comments
 (0)