Skip to content

Commit 07004a8

Browse files
devnexenrostedt
authored andcommitted
eventfs: Hold eventfs_mutex and SRCU when remount walks events
Commit 340f0c7 ("eventfs: Update all the eventfs_inodes from the events descriptor") had eventfs_set_attrs() recurse through ei->children on remount. The walk only holds the rcu_read_lock() taken by tracefs_apply_options() over tracefs_inodes, which is wrong: - list_for_each_entry over ei->children races with the list_del_rcu() in eventfs_remove_rec() -- LIST_POISON1 deref, same shape as d260327. - eventfs_inodes are freed via call_srcu(&eventfs_srcu, ...). rcu_read_lock() does not extend an SRCU grace period, so ti->private can be reclaimed under the walk. - The writes to ei->attr race with eventfs_set_attr(), which holds eventfs_mutex. Reproducer: while :; do mount -o remount,uid=$((RANDOM%1000)) /sys/kernel/tracing; done & while :; do echo "p:kp submit_bio" > /sys/kernel/tracing/kprobe_events echo > /sys/kernel/tracing/kprobe_events done Wrap the events portion of tracefs_apply_options() in eventfs_remount_lock()/_unlock() that take eventfs_mutex and srcu_read_lock(&eventfs_srcu). eventfs_set_attrs() doesn't sleep so the nested rcu_read_lock() is fine; lockdep_assert_held() pins the contract. Comment in tracefs_drop_inode() said "RCU cycle" -- it is SRCU. Fixes: 340f0c7 ("eventfs: Update all the eventfs_inodes from the events descriptor") Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260418191737.10289-1-devnexen@gmail.com Signed-off-by: David Carlier <devnexen@gmail.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
1 parent f67950b commit 07004a8

3 files changed

Lines changed: 21 additions & 1 deletion

File tree

fs/tracefs/event_inode.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ static void eventfs_set_attrs(struct eventfs_inode *ei, bool update_uid, kuid_t
244244
{
245245
struct eventfs_inode *ei_child;
246246

247+
lockdep_assert_held(&eventfs_mutex);
248+
247249
/* Update events/<system>/<event> */
248250
if (WARN_ON_ONCE(level > 3))
249251
return;
@@ -886,3 +888,15 @@ void eventfs_remove_events_dir(struct eventfs_inode *ei)
886888
d_invalidate(dentry);
887889
d_make_discardable(dentry);
888890
}
891+
892+
int eventfs_remount_lock(void)
893+
{
894+
mutex_lock(&eventfs_mutex);
895+
return srcu_read_lock(&eventfs_srcu);
896+
}
897+
898+
void eventfs_remount_unlock(int srcu_idx)
899+
{
900+
srcu_read_unlock(&eventfs_srcu, srcu_idx);
901+
mutex_unlock(&eventfs_mutex);
902+
}

fs/tracefs/inode.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ static int tracefs_apply_options(struct super_block *sb, bool remount)
313313
struct inode *inode = d_inode(sb->s_root);
314314
struct tracefs_inode *ti;
315315
bool update_uid, update_gid;
316+
int srcu_idx;
316317
umode_t tmp_mode;
317318

318319
/*
@@ -337,6 +338,7 @@ static int tracefs_apply_options(struct super_block *sb, bool remount)
337338
update_uid = fsi->opts & BIT(Opt_uid);
338339
update_gid = fsi->opts & BIT(Opt_gid);
339340

341+
srcu_idx = eventfs_remount_lock();
340342
rcu_read_lock();
341343
list_for_each_entry_rcu(ti, &tracefs_inodes, list) {
342344
if (update_uid) {
@@ -358,6 +360,7 @@ static int tracefs_apply_options(struct super_block *sb, bool remount)
358360
eventfs_remount(ti, update_uid, update_gid);
359361
}
360362
rcu_read_unlock();
363+
eventfs_remount_unlock(srcu_idx);
361364
}
362365

363366
return 0;
@@ -403,7 +406,7 @@ static int tracefs_drop_inode(struct inode *inode)
403406
* This inode is being freed and cannot be used for
404407
* eventfs. Clear the flag so that it doesn't call into
405408
* eventfs during the remount flag updates. The eventfs_inode
406-
* gets freed after an RCU cycle, so the content will still
409+
* gets freed after an SRCU cycle, so the content will still
407410
* be safe if the iteration is going on now.
408411
*/
409412
ti->flags &= ~TRACEFS_EVENT_INODE;

fs/tracefs/internal.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,7 @@ struct inode *tracefs_get_inode(struct super_block *sb);
7676
void eventfs_remount(struct tracefs_inode *ti, bool update_uid, bool update_gid);
7777
void eventfs_d_release(struct dentry *dentry);
7878

79+
int eventfs_remount_lock(void);
80+
void eventfs_remount_unlock(int srcu_idx);
81+
7982
#endif /* _TRACEFS_INTERNAL_H */

0 commit comments

Comments
 (0)