Skip to contentSkip to conversation

xdp: xdp_mem_allocator can be NULL in trace_mem_connect().

PATCH Superseded Sebastian Andrzej Siewior 3 participants 3 messages Mar 9, 2022

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 xdp: xdp_mem_allocator can be NULL in trace_mem_connect().

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.

The trace points (mem_connect + mem_disconnect) were put in place to pair connect/disconnect using the IDs. The ID is only assigned if __xdp_reg_mem_model() does not return NULL. That connect trace point is of no use if there is no ID.

Skip that connect trace point if xdp_alloc is NULL.

[ Toke Høiland-Jørgensen delivered the reasoning for skipping the trace
point ]

Fixes 4a48ef70b93b8 ("xdp: Allow registering memory model without rxq reference")

---
v1…v2:
- Instead letting the trace point deal with a NULL pointer, skip the trace point.

 net/core/xdp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/xdp.c +2 -1
index 7aba355049862..8ebb22eb6497c 100644
@@ -357,7 +357,8 @@ int xdp_rxq_info_reg_mem_model(struct xdp_rxq_info *xdp_rxq,
 	if (IS_ERR(xdp_alloc))
 		return PTR_ERR(xdp_alloc);
 
-	trace_mem_connect(xdp_alloc, xdp_rxq);
+	if (xdp_alloc)
+		trace_mem_connect(xdp_alloc, xdp_rxq);
 	return 0;
 }
 
Signature · 1 line
2.35.1
#1 lore raw

net/core/xdp.c int xdp_rxq_info_reg_mem_model(struct xdp_rxq_info *xdp_rxq, · line 360

Quoted 8 lines · On Wed, 9 Mar 2022 21:47:38 +0100 Sebastian Andrzej Siewior…
net/core/xdp.c +1 -1
@@ -357,7 +357,8 @@ int xdp_rxq_info_reg_mem_model(struct xdp_rxq_info *xdp_rxq,
 	if (IS_ERR(xdp_alloc))
 		return PTR_ERR(xdp_alloc);
 
-	trace_mem_connect(xdp_alloc, xdp_rxq);
+	if (xdp_alloc)

Eliminate the check when tracing is disabled:

	if (trace_mem_connect_enabled() && xdp_alloc)

-- Steve

Quoted 4 lines
net/core/xdp.c +1 -0
+		trace_mem_connect(xdp_alloc, xdp_rxq);
 	return 0;
 }
 
Acked-by on v2 1/1
#2 lore raw
In reply to Sebastian Andrzej Siewior
Quoted 9 lines · Sebastian Andrzej Siewior

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.

The trace points (mem_connect + mem_disconnect) were put in place to pair connect/disconnect using the IDs. The ID is only assigned if __xdp_reg_mem_model() does not return NULL. That connect trace point is of no use if there is no ID.

Quoted 7 lines

Skip that connect trace point if xdp_alloc is NULL.

[ Toke Høiland-Jørgensen delivered the reasoning for skipping the trace
point ]

Fixes 4a48ef70b93b8 ("xdp: Allow registering memory model without rxq reference")

With Steven's fix: