Commit cb3a638b authored by Al Viro's avatar Al Viro Committed by Ben Hutchings

fix d_walk()/non-delayed __d_free() race

commit 3d56c25e upstream.

Ascend-to-parent logics in d_walk() depends on all encountered child
dentries not getting freed without an RCU delay.  Unfortunately, in
quite a few cases it is not true, with hard-to-hit oopsable race as
the result.

Fortunately, the fix is simiple; right now the rule is "if it ever
been hashed, freeing must be delayed" and changing it to "if it
ever had a parent, freeing must be delayed" closes that hole and
covers all cases the old rule used to cover.  Moreover, pipes and
sockets remain _not_ covered, so we do not introduce RCU delay in
the cases which are the reason for having that delay conditional
in the first place.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
[bwh: Backported to 3.16:
 - Adjust context
 - Also set the flag in __d_materialise_dentry())]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent bd687789
...@@ -1502,7 +1502,7 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name) ...@@ -1502,7 +1502,7 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name)
struct dentry *dentry = __d_alloc(parent->d_sb, name); struct dentry *dentry = __d_alloc(parent->d_sb, name);
if (!dentry) if (!dentry)
return NULL; return NULL;
dentry->d_flags |= DCACHE_RCUACCESS;
spin_lock(&parent->d_lock); spin_lock(&parent->d_lock);
/* /*
* don't need child lock because it is not subject * don't need child lock because it is not subject
...@@ -2354,7 +2354,6 @@ static void __d_rehash(struct dentry * entry, struct hlist_bl_head *b) ...@@ -2354,7 +2354,6 @@ static void __d_rehash(struct dentry * entry, struct hlist_bl_head *b)
{ {
BUG_ON(!d_unhashed(entry)); BUG_ON(!d_unhashed(entry));
hlist_bl_lock(b); hlist_bl_lock(b);
entry->d_flags |= DCACHE_RCUACCESS;
hlist_bl_add_head_rcu(&entry->d_hash, b); hlist_bl_add_head_rcu(&entry->d_hash, b);
hlist_bl_unlock(b); hlist_bl_unlock(b);
} }
...@@ -2560,6 +2559,7 @@ static void __d_move(struct dentry *dentry, struct dentry *target, ...@@ -2560,6 +2559,7 @@ static void __d_move(struct dentry *dentry, struct dentry *target,
/* ... and switch the parents */ /* ... and switch the parents */
if (IS_ROOT(dentry)) { if (IS_ROOT(dentry)) {
dentry->d_flags |= DCACHE_RCUACCESS;
dentry->d_parent = target->d_parent; dentry->d_parent = target->d_parent;
target->d_parent = target; target->d_parent = target;
INIT_LIST_HEAD(&target->d_child); INIT_LIST_HEAD(&target->d_child);
...@@ -2696,6 +2696,7 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon) ...@@ -2696,6 +2696,7 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon)
switch_names(dentry, anon, false); switch_names(dentry, anon, false);
dentry->d_flags |= DCACHE_RCUACCESS;
dentry->d_parent = dentry; dentry->d_parent = dentry;
list_del_init(&dentry->d_child); list_del_init(&dentry->d_child);
anon->d_parent = dparent; anon->d_parent = dparent;
......
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