mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-08-05 08:49:39 +00:00
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From c1f37037f88fa0886f550c2fe4f96faed98810d8 Mon Sep 17 00:00:00 2001
|
|
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
|
Date: Wed, 28 Mar 2018 15:10:56 -0500
|
|
Subject: [PATCH 123/418] tracing: Make sure variable string fields are
|
|
NULL-terminated
|
|
|
|
The strncpy() currently being used for variable string fields can
|
|
result in a lack of termination if the string length is equal to the
|
|
field size. Use the safer strscpy() instead, which will guarantee
|
|
termination.
|
|
|
|
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
kernel/trace/trace_events_hist.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
|
|
index 514ec0b31eed..37db86145c8b 100644
|
|
--- a/kernel/trace/trace_events_hist.c
|
|
+++ b/kernel/trace/trace_events_hist.c
|
|
@@ -669,7 +669,7 @@ static notrace void trace_event_raw_event_synth(void *__data,
|
|
char *str_val = (char *)(long)var_ref_vals[var_ref_idx + i];
|
|
char *str_field = (char *)&entry->fields[n_u64];
|
|
|
|
- strncpy(str_field, str_val, STR_VAR_LEN_MAX);
|
|
+ strscpy(str_field, str_val, STR_VAR_LEN_MAX);
|
|
n_u64 += STR_VAR_LEN_MAX / sizeof(u64);
|
|
} else {
|
|
entry->fields[n_u64] = var_ref_vals[var_ref_idx + i];
|
|
@@ -3090,7 +3090,7 @@ static inline void __update_field_vars(struct tracing_map_elt *elt,
|
|
char *str = elt_data->field_var_str[j++];
|
|
char *val_str = (char *)(uintptr_t)var_val;
|
|
|
|
- strncpy(str, val_str, STR_VAR_LEN_MAX);
|
|
+ strscpy(str, val_str, STR_VAR_LEN_MAX);
|
|
var_val = (u64)(uintptr_t)str;
|
|
}
|
|
tracing_map_set_var(elt, var_idx, var_val);
|
|
--
|
|
2.17.1
|
|
|