[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20220407120513.6f64b67e@gandalf.local.home>
Date: Thu, 7 Apr 2022 12:05:13 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: Chuck Lever III <chuck.lever@...cle.com>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: runtime warning after merge of the cel-fixes tree
On Thu, 7 Apr 2022 11:50:30 -0400
Steven Rostedt <rostedt@...dmis.org> wrote:
> > Actually, I found an issue with the above that will not fix it, but the fix
> > to that is not that difficult (currently testing it this time).
>
> Take two:
I found a way that can even make it more robust and easier to backport:
Take three:
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index e11e167b7809..c060ae35f785 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -392,12 +392,6 @@ static void test_event_printk(struct trace_event_call *call)
if (!(dereference_flags & (1ULL << arg)))
goto next_arg;
- /* Check for __get_sockaddr */;
- if (str_has_prefix(fmt + i, "__get_sockaddr(")) {
- dereference_flags &= ~(1ULL << arg);
- goto next_arg;
- }
-
/* Find the REC-> in the argument */
c = strchr(fmt + i, ',');
r = strstr(fmt + i, "REC->");
@@ -413,7 +407,14 @@ static void test_event_printk(struct trace_event_call *call)
a = strchr(fmt + i, '&');
if ((a && (a < r)) || test_field(r, call))
dereference_flags &= ~(1ULL << arg);
+ } else if ((r = strstr(fmt + i, "__get_dynamic_array(")) &&
+ (!c || r < c)) {
+ dereference_flags &= ~(1ULL << arg);
+ } else if ((r = strstr(fmt + i, "__get_sockaddr(")) &&
+ (!c || r < c)) {
+ dereference_flags &= ~(1ULL << arg);
}
+
next_arg:
i--;
arg++;
Powered by blists - more mailing lists