Skip to content

Commit ee4e037

Browse files
committed
eventfs: Free all of the eventfs_inode after RCU
The freeing of eventfs_inode via a kfree_rcu() callback. But the content of the eventfs_inode was being freed after the last kref. This is dangerous, as changes are being made that can access the content of an eventfs_inode from an RCU loop. Instead of using kfree_rcu() use call_rcu() that calls a function to do all the freeing of the eventfs_inode after a RCU grace period has expired. Link: https://lore.kernel.org/linux-trace-kernel/[email protected] Cc: [email protected] Cc: Masami Hiramatsu <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Mathieu Desnoyers <[email protected]> Cc: Andrew Morton <[email protected]> Fixes: 43aa6f9 ("eventfs: Get rid of dentry pointers without refcounts") Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent b63db58 commit ee4e037

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

fs/tracefs/event_inode.c

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,21 @@ enum {
7373

7474
#define EVENTFS_MODE_MASK (EVENTFS_SAVE_MODE - 1)
7575

76+
static void free_ei_rcu(struct rcu_head *rcu)
77+
{
78+
struct eventfs_inode *ei = container_of(rcu, struct eventfs_inode, rcu);
79+
struct eventfs_root_inode *rei;
80+
81+
kfree(ei->entry_attrs);
82+
kfree_const(ei->name);
83+
if (ei->is_events) {
84+
rei = get_root_inode(ei);
85+
kfree(rei);
86+
} else {
87+
kfree(ei);
88+
}
89+
}
90+
7691
/*
7792
* eventfs_inode reference count management.
7893
*
@@ -85,7 +100,6 @@ static void release_ei(struct kref *ref)
85100
{
86101
struct eventfs_inode *ei = container_of(ref, struct eventfs_inode, kref);
87102
const struct eventfs_entry *entry;
88-
struct eventfs_root_inode *rei;
89103

90104
WARN_ON_ONCE(!ei->is_freed);
91105

@@ -95,14 +109,7 @@ static void release_ei(struct kref *ref)
95109
entry->release(entry->name, ei->data);
96110
}
97111

98-
kfree(ei->entry_attrs);
99-
kfree_const(ei->name);
100-
if (ei->is_events) {
101-
rei = get_root_inode(ei);
102-
kfree_rcu(rei, ei.rcu);
103-
} else {
104-
kfree_rcu(ei, rcu);
105-
}
112+
call_rcu(&ei->rcu, free_ei_rcu);
106113
}
107114

108115
static inline void put_ei(struct eventfs_inode *ei)

0 commit comments

Comments
 (0)