Thread (3 messages) 3 messages, 3 authors, 2020-12-25
STALE2035d

[PATCH] bpf: fix: address of local auto-variable assigned to a function parameter.

From: YANG LI <hidden>
Date: 2020-12-24 07:02:53
Also in: bpf, lkml
Subsystem: bpf [general] (safe dynamic programs and tools), the rest, xdp (express data path) · Maintainers: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Linus Torvalds, David S. Miller, Jakub Kicinski, Jesper Dangaard Brouer, John Fastabend

Assigning local variable txq to the outputting parameter xdp->txq is not
safe, txq will be released after the end of the function call. 
Then the result of using xdp is unpredictable.

Fix this error by defining the struct xdp_txq_info in function
dev_map_run_prog() as a static type.

Signed-off-by: YANG LI <redacted>
Reported-by: Abaci <redacted>
---
 kernel/bpf/devmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
index f6e9c68..af6f004 100644
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -454,7 +454,7 @@ static struct xdp_buff *dev_map_run_prog(struct net_device *dev,
 					 struct xdp_buff *xdp,
 					 struct bpf_prog *xdp_prog)
 {
-	struct xdp_txq_info txq = { .dev = dev };
+	static struct xdp_txq_info txq = { .dev = dev };
 	u32 act;
 
 	xdp_set_data_meta_invalid(xdp);
-- 
1.8.3.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help