Skip to content

Commit c1cd442

Browse files
rostedtintel-lab-lkp
authored andcommitted
tracing: Have trace_event_file have ref counters
The following can crash the kernel: # cd /sys/kernel/tracing # echo 'p:sched schedule' > kprobe_events # exec 5>>events/kprobes/sched/enable # > kprobe_events # exec 5>&- The above commands: 1. Change directory to the tracefs directory 2. Create a kprobe event (doesn't matter what one) 3. Open bash file descriptor 5 on the enable file of the kprobe event 4. Delete the kprobe event (removes the files too) 5. Close the bash file descriptor 5 The above causes a crash! BUG: kernel NULL pointer dereference, address: 0000000000000028 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP PTI CPU: 6 PID: 877 Comm: bash Not tainted 6.5.0-rc4-test-00008-g2c6b6b1029d4-dirty torvalds#186 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 RIP: 0010:tracing_release_file_tr+0xc/0x50 What happens here is that the kprobe event creates a trace_event_file "file" descriptor that represents the file in tracefs to the event. It maintains state of the event (is it enabled for the given instance?). Opening the "enable" file gets a reference to the event "file" descriptor via the open file descriptor. When the kprobe event is deleted, the file is also deleted from the tracefs system which also frees the event "file" descriptor. But as the tracefs file is still opened by user space, it will not be totally removed until the final dput() is called on it. But this is not true with the event "file" descriptor that is already freed. If the user does a write to or simply closes the file descriptor it will reference the event "file" descriptor that was just freed, causing a use-after-free bug. To solve this, add a ref count to the event "file" descriptor as well as a new flag called "FREED". The "file" will not be freed until the last reference is released. But the FREE flag will be set when the event is removed to prevent any more modifications to that event from happening, even if there's still a reference to the event "file" descriptor. Link: https://lore.kernel.org/linux-trace-kernel/[email protected]/ Cc: [email protected] Fixes: f5ca233 ("tracing: Increase trace array ref count on enable and filter files") Reported-by: Beau Belgrave <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 9c2d379 commit c1cd442

File tree

5 files changed

+52
-4
lines changed

5 files changed

+52
-4
lines changed

include/linux/trace_events.h

+4
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,7 @@ enum {
492492
EVENT_FILE_FL_TRIGGER_COND_BIT,
493493
EVENT_FILE_FL_PID_FILTER_BIT,
494494
EVENT_FILE_FL_WAS_ENABLED_BIT,
495+
EVENT_FILE_FL_FREED_BIT,
495496
};
496497

497498
extern struct trace_event_file *trace_get_event_file(const char *instance,
@@ -630,6 +631,7 @@ extern int __kprobe_event_add_fields(struct dynevent_cmd *cmd, ...);
630631
* TRIGGER_COND - When set, one or more triggers has an associated filter
631632
* PID_FILTER - When set, the event is filtered based on pid
632633
* WAS_ENABLED - Set when enabled to know to clear trace on module removal
634+
* FREED - File descriptor is freed, all fields should be considered invalid
633635
*/
634636
enum {
635637
EVENT_FILE_FL_ENABLED = (1 << EVENT_FILE_FL_ENABLED_BIT),
@@ -643,6 +645,7 @@ enum {
643645
EVENT_FILE_FL_TRIGGER_COND = (1 << EVENT_FILE_FL_TRIGGER_COND_BIT),
644646
EVENT_FILE_FL_PID_FILTER = (1 << EVENT_FILE_FL_PID_FILTER_BIT),
645647
EVENT_FILE_FL_WAS_ENABLED = (1 << EVENT_FILE_FL_WAS_ENABLED_BIT),
648+
EVENT_FILE_FL_FREED = (1 << EVENT_FILE_FL_FREED_BIT),
646649
};
647650

648651
struct trace_event_file {
@@ -671,6 +674,7 @@ struct trace_event_file {
671674
* caching and such. Which is mostly OK ;-)
672675
*/
673676
unsigned long flags;
677+
atomic_t ref; /* ref count for opened files */
674678
atomic_t sm_ref; /* soft-mode reference counter */
675679
atomic_t tm_ref; /* trigger-mode reference counter */
676680
};

kernel/trace/trace.c

+15
Original file line numberDiff line numberDiff line change
@@ -4978,6 +4978,20 @@ int tracing_open_file_tr(struct inode *inode, struct file *filp)
49784978
if (ret)
49794979
return ret;
49804980

4981+
mutex_lock(&event_mutex);
4982+
4983+
/* Fail if the file is marked for removal */
4984+
if (file->flags & EVENT_FILE_FL_FREED) {
4985+
trace_array_put(file->tr);
4986+
ret = -ENODEV;
4987+
} else {
4988+
event_file_get(file);
4989+
}
4990+
4991+
mutex_unlock(&event_mutex);
4992+
if (ret)
4993+
return ret;
4994+
49814995
filp->private_data = inode->i_private;
49824996

49834997
return 0;
@@ -4988,6 +5002,7 @@ int tracing_release_file_tr(struct inode *inode, struct file *filp)
49885002
struct trace_event_file *file = inode->i_private;
49895003

49905004
trace_array_put(file->tr);
5005+
event_file_put(file);
49915006

49925007
return 0;
49935008
}

kernel/trace/trace.h

+3
Original file line numberDiff line numberDiff line change
@@ -1669,6 +1669,9 @@ extern void event_trigger_unregister(struct event_command *cmd_ops,
16691669
char *glob,
16701670
struct event_trigger_data *trigger_data);
16711671

1672+
extern void event_file_get(struct trace_event_file *file);
1673+
extern void event_file_put(struct trace_event_file *file);
1674+
16721675
/**
16731676
* struct event_trigger_ops - callbacks for trace event triggers
16741677
*

kernel/trace/trace_events.c

+27-4
Original file line numberDiff line numberDiff line change
@@ -990,13 +990,35 @@ static void remove_subsystem(struct trace_subsystem_dir *dir)
990990
}
991991
}
992992

993+
void event_file_get(struct trace_event_file *file)
994+
{
995+
atomic_inc(&file->ref);
996+
}
997+
998+
void event_file_put(struct trace_event_file *file)
999+
{
1000+
if (WARN_ON_ONCE(!atomic_read(&file->ref))) {
1001+
if (file->flags & EVENT_FILE_FL_FREED)
1002+
kmem_cache_free(file_cachep, file);
1003+
return;
1004+
}
1005+
1006+
if (atomic_dec_and_test(&file->ref)) {
1007+
/* Count should only go to zero when it is freed */
1008+
if (WARN_ON_ONCE(!(file->flags & EVENT_FILE_FL_FREED)))
1009+
return;
1010+
kmem_cache_free(file_cachep, file);
1011+
}
1012+
}
1013+
9931014
static void remove_event_file_dir(struct trace_event_file *file)
9941015
{
9951016
eventfs_remove_dir(file->ei);
9961017
list_del(&file->list);
9971018
remove_subsystem(file->system);
9981019
free_event_filter(file->filter);
999-
kmem_cache_free(file_cachep, file);
1020+
file->flags |= EVENT_FILE_FL_FREED;
1021+
event_file_put(file);
10001022
}
10011023

10021024
/*
@@ -1369,7 +1391,7 @@ event_enable_read(struct file *filp, char __user *ubuf, size_t cnt,
13691391
flags = file->flags;
13701392
mutex_unlock(&event_mutex);
13711393

1372-
if (!file)
1394+
if (!file || flags & EVENT_FILE_FL_FREED)
13731395
return -ENODEV;
13741396

13751397
if (flags & EVENT_FILE_FL_ENABLED &&
@@ -1403,7 +1425,7 @@ event_enable_write(struct file *filp, const char __user *ubuf, size_t cnt,
14031425
ret = -ENODEV;
14041426
mutex_lock(&event_mutex);
14051427
file = event_file_data(filp);
1406-
if (likely(file)) {
1428+
if (likely(file && !(file->flags & EVENT_FILE_FL_FREED))) {
14071429
ret = tracing_update_buffers(file->tr);
14081430
if (ret < 0) {
14091431
mutex_unlock(&event_mutex);
@@ -1683,7 +1705,7 @@ event_filter_read(struct file *filp, char __user *ubuf, size_t cnt,
16831705

16841706
mutex_lock(&event_mutex);
16851707
file = event_file_data(filp);
1686-
if (file)
1708+
if (file && !(file->flags & EVENT_FILE_FL_FREED))
16871709
print_event_filter(file, s);
16881710
mutex_unlock(&event_mutex);
16891711

@@ -2902,6 +2924,7 @@ trace_create_new_event(struct trace_event_call *call,
29022924
atomic_set(&file->tm_ref, 0);
29032925
INIT_LIST_HEAD(&file->triggers);
29042926
list_add(&file->list, &tr->events);
2927+
event_file_get(file);
29052928

29062929
return file;
29072930
}

kernel/trace/trace_events_filter.c

+3
Original file line numberDiff line numberDiff line change
@@ -2349,6 +2349,9 @@ int apply_event_filter(struct trace_event_file *file, char *filter_string)
23492349
struct event_filter *filter = NULL;
23502350
int err;
23512351

2352+
if (file->flags & EVENT_FILE_FL_FREED)
2353+
return -ENODEV;
2354+
23522355
if (!strcmp(strstrip(filter_string), "0")) {
23532356
filter_disable(file);
23542357
filter = event_filter(file);

0 commit comments

Comments
 (0)