From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: netdev@vger.kernel.org, bpf@vger.kernel.org
Cc: "Alexei Starovoitov" <ast@kernel.org>,
"Andrii Nakryiko" <andrii@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"David S. Miller" <davem@davemloft.net>,
"Ingo Molnar" <mingo@redhat.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Jesper Dangaard Brouer" <hawk@kernel.org>,
"John Fastabend" <john.fastabend@gmail.com>,
"KP Singh" <kpsingh@kernel.org>,
"Martin KaFai Lau" <kafai@fb.com>,
"Song Liu" <songliubraving@fb.com>,
"Steven Rostedt" <rostedt@goodmis.org>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Toke Høiland-Jørgensen" <toke@redhat.com>,
"Yonghong Song" <yhs@fb.com>
Subject: [PATCH net] xdp: xdp_mem_allocator can be NULL in trace_mem_connect().
Date: Thu, 3 Mar 2022 13:26:47 +0100 [thread overview]
Message-ID: <YiC0BwndXiwxGDNz@linutronix.de> (raw)
Since the commit mentioned below __xdp_reg_mem_model() can return a NULL
pointer. This pointer is dereferenced in trace_mem_connect() which leads
to segfault. It can be reproduced with enabled trace events during ifup.
Only assign the arguments in the trace-event macro if `xa' is set.
Otherwise set the parameters to 0.
Fixes: 4a48ef70b93b8 ("xdp: Allow registering memory model without rxq reference")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
include/trace/events/xdp.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h
index c40fc97f94171..9196dcd08e6c7 100644
--- a/include/trace/events/xdp.h
+++ b/include/trace/events/xdp.h
@@ -362,9 +362,9 @@ TRACE_EVENT(mem_connect,
TP_fast_assign(
__entry->xa = xa;
- __entry->mem_id = xa->mem.id;
- __entry->mem_type = xa->mem.type;
- __entry->allocator = xa->allocator;
+ __entry->mem_id = xa ? xa->mem.id : 0;
+ __entry->mem_type = xa ? xa->mem.type : 0;
+ __entry->allocator = xa ? xa->allocator : NULL;
__entry->rxq = rxq;
__entry->ifindex = rxq->dev->ifindex;
),
--
2.35.1
next reply other threads:[~2022-03-03 12:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-03 12:26 Sebastian Andrzej Siewior [this message]
2022-03-03 13:59 ` [PATCH net] xdp: xdp_mem_allocator can be NULL in trace_mem_connect() Toke Høiland-Jørgensen
2022-03-03 14:12 ` Sebastian Andrzej Siewior
2022-03-03 17:31 ` Jesper Dangaard Brouer
2022-03-07 16:50 ` Toke Høiland-Jørgensen
2022-03-07 17:59 ` Sebastian Andrzej Siewior
2022-03-07 18:07 ` Toke Høiland-Jørgensen
2022-03-09 17:15 ` Jakub Kicinski
2022-03-09 20:48 ` Sebastian Andrzej Siewior
2022-03-09 21:03 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YiC0BwndXiwxGDNz@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=songliubraving@fb.com \
--cc=tglx@linutronix.de \
--cc=toke@redhat.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox