forked from Minki/linux
tracing: Add a verifier to check string pointers for trace events
It is a common mistake for someone writing a trace event to save a pointer to a string in the TP_fast_assign() and then display that string pointer in the TP_printk() with %s. The problem is that those two events may happen a long time apart, where the source of the string may no longer exist. The proper way to handle displaying any string that is not guaranteed to be in the kernel core rodata section, is to copy it into the ring buffer via the __string(), __assign_str() and __get_str() helper macros. Add a check at run time while displaying the TP_printk() of events to make sure that every %s referenced is safe to dereference, and if it is not, trigger a warning and only show the address of the pointer, and the dereferenced string if it can be safely retrieved with a strncpy_from_kernel_nofault() call. In order to not have to copy the parsing of vsnprintf() formats, or even exporting its code, the verifier relies on vsnprintf() being able to modify the va_list that is passed to it, and it remains modified after it is called. This is the case for some architectures like x86_64, but other architectures like x86_32 pass the va_list to vsnprintf() as a value not a reference, and the verifier can not use it to parse the non string arguments. Thus, at boot up, it is checked if vsnprintf() modifies the passed in va_list or not, and a static branch will disable the verifier if it's not compatible. Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
parent
f2616c772c
commit
9a6944fee6
@ -3558,6 +3558,204 @@ static char *trace_iter_expand_format(struct trace_iterator *iter)
|
||||
return tmp;
|
||||
}
|
||||
|
||||
/* Returns true if the string is safe to dereference from an event */
|
||||
static bool trace_safe_str(struct trace_iterator *iter, const char *str)
|
||||
{
|
||||
unsigned long addr = (unsigned long)str;
|
||||
struct trace_event *trace_event;
|
||||
struct trace_event_call *event;
|
||||
|
||||
/* OK if part of the event data */
|
||||
if ((addr >= (unsigned long)iter->ent) &&
|
||||
(addr < (unsigned long)iter->ent + iter->ent_size))
|
||||
return true;
|
||||
|
||||
/* OK if part of the temp seq buffer */
|
||||
if ((addr >= (unsigned long)iter->tmp_seq.buffer) &&
|
||||
(addr < (unsigned long)iter->tmp_seq.buffer + PAGE_SIZE))
|
||||
return true;
|
||||
|
||||
/* Core rodata can not be freed */
|
||||
if (is_kernel_rodata(addr))
|
||||
return true;
|
||||
|
||||
if (trace_is_tracepoint_string(str))
|
||||
return true;
|
||||
|
||||
/*
|
||||
* Now this could be a module event, referencing core module
|
||||
* data, which is OK.
|
||||
*/
|
||||
if (!iter->ent)
|
||||
return false;
|
||||
|
||||
trace_event = ftrace_find_event(iter->ent->type);
|
||||
if (!trace_event)
|
||||
return false;
|
||||
|
||||
event = container_of(trace_event, struct trace_event_call, event);
|
||||
if (!event->mod)
|
||||
return false;
|
||||
|
||||
/* Would rather have rodata, but this will suffice */
|
||||
if (within_module_core(addr, event->mod))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static const char *show_buffer(struct trace_seq *s)
|
||||
{
|
||||
struct seq_buf *seq = &s->seq;
|
||||
|
||||
seq_buf_terminate(seq);
|
||||
|
||||
return seq->buffer;
|
||||
}
|
||||
|
||||
static DEFINE_STATIC_KEY_FALSE(trace_no_verify);
|
||||
|
||||
static int test_can_verify_check(const char *fmt, ...)
|
||||
{
|
||||
char buf[16];
|
||||
va_list ap;
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* The verifier is dependent on vsnprintf() modifies the va_list
|
||||
* passed to it, where it is sent as a reference. Some architectures
|
||||
* (like x86_32) passes it by value, which means that vsnprintf()
|
||||
* does not modify the va_list passed to it, and the verifier
|
||||
* would then need to be able to understand all the values that
|
||||
* vsnprintf can use. If it is passed by value, then the verifier
|
||||
* is disabled.
|
||||
*/
|
||||
va_start(ap, fmt);
|
||||
vsnprintf(buf, 16, "%d", ap);
|
||||
ret = va_arg(ap, int);
|
||||
va_end(ap);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void test_can_verify(void)
|
||||
{
|
||||
if (!test_can_verify_check("%d %d", 0, 1)) {
|
||||
pr_info("trace event string verifier disabled\n");
|
||||
static_branch_inc(&trace_no_verify);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* trace_check_vprintf - Check dereferenced strings while writing to the seq buffer
|
||||
* @iter: The iterator that holds the seq buffer and the event being printed
|
||||
* @fmt: The format used to print the event
|
||||
* @ap: The va_list holding the data to print from @fmt.
|
||||
*
|
||||
* This writes the data into the @iter->seq buffer using the data from
|
||||
* @fmt and @ap. If the format has a %s, then the source of the string
|
||||
* is examined to make sure it is safe to print, otherwise it will
|
||||
* warn and print "[UNSAFE MEMORY]" in place of the dereferenced string
|
||||
* pointer.
|
||||
*/
|
||||
void trace_check_vprintf(struct trace_iterator *iter, const char *fmt,
|
||||
va_list ap)
|
||||
{
|
||||
const char *p = fmt;
|
||||
const char *str;
|
||||
int i, j;
|
||||
|
||||
if (WARN_ON_ONCE(!fmt))
|
||||
return;
|
||||
|
||||
if (static_branch_unlikely(&trace_no_verify))
|
||||
goto print;
|
||||
|
||||
/* Don't bother checking when doing a ftrace_dump() */
|
||||
if (iter->fmt == static_fmt_buf)
|
||||
goto print;
|
||||
|
||||
while (*p) {
|
||||
j = 0;
|
||||
|
||||
/* We only care about %s and variants */
|
||||
for (i = 0; p[i]; i++) {
|
||||
if (i + 1 >= iter->fmt_size) {
|
||||
/*
|
||||
* If we can't expand the copy buffer,
|
||||
* just print it.
|
||||
*/
|
||||
if (!trace_iter_expand_format(iter))
|
||||
goto print;
|
||||
}
|
||||
|
||||
if (p[i] == '\\' && p[i+1]) {
|
||||
i++;
|
||||
continue;
|
||||
}
|
||||
if (p[i] == '%') {
|
||||
/* Need to test cases like %08.*s */
|
||||
for (j = 1; p[i+j]; j++) {
|
||||
if (isdigit(p[i+j]) ||
|
||||
p[i+j] == '*' ||
|
||||
p[i+j] == '.')
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
if (p[i+j] == 's')
|
||||
break;
|
||||
}
|
||||
j = 0;
|
||||
}
|
||||
/* If no %s found then just print normally */
|
||||
if (!p[i])
|
||||
break;
|
||||
|
||||
/* Copy up to the %s, and print that */
|
||||
strncpy(iter->fmt, p, i);
|
||||
iter->fmt[i] = '\0';
|
||||
trace_seq_vprintf(&iter->seq, iter->fmt, ap);
|
||||
|
||||
/* The ap now points to the string data of the %s */
|
||||
str = va_arg(ap, const char *);
|
||||
|
||||
/*
|
||||
* If you hit this warning, it is likely that the
|
||||
* trace event in question used %s on a string that
|
||||
* was saved at the time of the event, but may not be
|
||||
* around when the trace is read. Use __string(),
|
||||
* __assign_str() and __get_str() helpers in the TRACE_EVENT()
|
||||
* instead. See samples/trace_events/trace-events-sample.h
|
||||
* for reference.
|
||||
*/
|
||||
if (WARN_ONCE(!trace_safe_str(iter, str),
|
||||
"fmt: '%s' current_buffer: '%s'",
|
||||
fmt, show_buffer(&iter->seq))) {
|
||||
int ret;
|
||||
|
||||
/* Try to safely read the string */
|
||||
ret = strncpy_from_kernel_nofault(iter->fmt, str,
|
||||
iter->fmt_size);
|
||||
if (ret < 0)
|
||||
trace_seq_printf(&iter->seq, "(0x%px)", str);
|
||||
else
|
||||
trace_seq_printf(&iter->seq, "(0x%px:%s)",
|
||||
str, iter->fmt);
|
||||
str = "[UNSAFE-MEMORY]";
|
||||
strcpy(iter->fmt, "%s");
|
||||
} else {
|
||||
strncpy(iter->fmt, p + i, j + 1);
|
||||
iter->fmt[j+1] = '\0';
|
||||
}
|
||||
trace_seq_printf(&iter->seq, iter->fmt, str);
|
||||
|
||||
p += i + j + 1;
|
||||
}
|
||||
print:
|
||||
if (*p)
|
||||
trace_seq_vprintf(&iter->seq, p, ap);
|
||||
}
|
||||
|
||||
const char *trace_event_format(struct trace_iterator *iter, const char *fmt)
|
||||
{
|
||||
const char *p, *new_fmt;
|
||||
@ -9675,6 +9873,8 @@ __init static int tracer_alloc_buffers(void)
|
||||
|
||||
register_snapshot_cmd();
|
||||
|
||||
test_can_verify();
|
||||
|
||||
return 0;
|
||||
|
||||
out_free_savedcmd:
|
||||
|
@ -582,7 +582,10 @@ struct trace_entry *trace_find_next_entry(struct trace_iterator *iter,
|
||||
void trace_buffer_unlock_commit_nostack(struct trace_buffer *buffer,
|
||||
struct ring_buffer_event *event);
|
||||
|
||||
bool trace_is_tracepoint_string(const char *str);
|
||||
const char *trace_event_format(struct trace_iterator *iter, const char *fmt);
|
||||
void trace_check_vprintf(struct trace_iterator *iter, const char *fmt,
|
||||
va_list ap);
|
||||
|
||||
int trace_empty(struct trace_iterator *iter);
|
||||
|
||||
|
@ -317,7 +317,7 @@ void trace_event_printf(struct trace_iterator *iter, const char *fmt, ...)
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, fmt);
|
||||
trace_seq_vprintf(&iter->seq, trace_event_format(iter, fmt), ap);
|
||||
trace_check_vprintf(iter, trace_event_format(iter, fmt), ap);
|
||||
va_end(ap);
|
||||
}
|
||||
EXPORT_SYMBOL(trace_event_printf);
|
||||
|
@ -251,6 +251,17 @@ int __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(__ftrace_vprintk);
|
||||
|
||||
bool trace_is_tracepoint_string(const char *str)
|
||||
{
|
||||
const char **ptr = __start___tracepoint_str;
|
||||
|
||||
for (ptr = __start___tracepoint_str; ptr < __stop___tracepoint_str; ptr++) {
|
||||
if (str == *ptr)
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static const char **find_next(void *v, loff_t *pos)
|
||||
{
|
||||
const char **fmt = v;
|
||||
|
Loading…
Reference in New Issue
Block a user