git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "net: validate variable length ll headers"
[pandora-kernel.git]
/
include
/
trace
/
ftrace.h
diff --git
a/include/trace/ftrace.h
b/include/trace/ftrace.h
index
7697249
..
763bf05
100644
(file)
--- a/
include/trace/ftrace.h
+++ b/
include/trace/ftrace.h
@@
-379,7
+379,8
@@
ftrace_define_fields_##call(struct ftrace_event_call *event_call) \
__data_size += (len) * sizeof(type);
#undef __string
__data_size += (len) * sizeof(type);
#undef __string
-#define __string(item, src) __dynamic_array(char, item, strlen(src) + 1)
+#define __string(item, src) __dynamic_array(char, item, \
+ strlen((src) ? (const char *)(src) : "(null)") + 1)
#undef DECLARE_EVENT_CLASS
#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
#undef DECLARE_EVENT_CLASS
#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
@@
-504,7
+505,7
@@
static inline notrace int ftrace_get_offsets_##call( \
#undef __assign_str
#define __assign_str(dst, src) \
#undef __assign_str
#define __assign_str(dst, src) \
- strcpy(__get_str(dst),
src
);
+ strcpy(__get_str(dst),
(src) ? (const char *)(src) : "(null)"
);
#undef TP_fast_assign
#define TP_fast_assign(args...) args
#undef TP_fast_assign
#define TP_fast_assign(args...) args