libtracefs sqlhist: Allow pointers to match longs
Currently, if a field that is a long tries to match a field that is a
pointer, tracefs_sqlhist() will fail with incompatible fields. But the
kernel will still allow it to match, do not fail here.
Link: https://lore.kernel.org/linux-trace-devel/20220819020349.747429-4-rostedt@goodmis.org
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
diff --git a/src/tracefs-hist.c b/src/tracefs-hist.c
index 302b9a7..14988d8 100644
--- a/src/tracefs-hist.c
+++ b/src/tracefs-hist.c
@@ -796,6 +796,7 @@
{
const struct tep_format_field *start_field;
const struct tep_format_field *end_field;
+ int start_flags, end_flags;
if (!trace_verify_event_field(start_event, start_field_name,
&start_field))
@@ -806,7 +807,11 @@
&end_field))
return false;
- if (start_field->flags != end_field->flags ||
+ /* A pointer can still match a long */
+ start_flags = start_field->flags & ~TEP_FIELD_IS_POINTER;
+ end_flags = end_field->flags & ~TEP_FIELD_IS_POINTER;
+
+ if (start_flags != end_flags ||
start_field->size != end_field->size) {
errno = EBADE;
return false;
