Commit c1befb88 authored by Jianyu Zhan's avatar Jianyu Zhan Committed by Greg Kroah-Hartman
Browse files

kernfs: fix a subdir count leak

Currently kernfs_link_sibling() increates parent->dir.subdirs before
adding the node into parent's chidren rb tree.

Because it is possible that kernfs_link_sibling() couldn't find
a suitable slot and bail out, this leads to a mismatch between
elevated subdir count with actual children node numbers.

This patches fix this problem, by moving the subdir accouting
after the actual addtion happening.
Signed-off-by: default avatarJianyu Zhan <>
Acked-by: default avatarTejun Heo <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent a798c10f
......@@ -232,9 +232,6 @@ static int kernfs_link_sibling(struct kernfs_node *kn)
struct rb_node **node = &kn->parent->dir.children.rb_node;
struct rb_node *parent = NULL;
if (kernfs_type(kn) == KERNFS_DIR)
while (*node) {
struct kernfs_node *pos;
int result;
......@@ -249,9 +246,15 @@ static int kernfs_link_sibling(struct kernfs_node *kn)
return -EEXIST;
/* add new node and rebalance the tree */
rb_link_node(&kn->rb, parent, node);
rb_insert_color(&kn->rb, &kn->parent->dir.children);
/* successfully added, account subdir number */
if (kernfs_type(kn) == KERNFS_DIR)
return 0;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment