Merge branch 'bpf-next/skb-meta-dynptr' into 'bpf-next/net'

Martin KaFai Lau · Martin KaFai Lau · commit 2dfd8b8de66d · 2025-09-04T21:22:00.000-07:00
Merge skb-meta-dynptr branch into net branch after fixing a compiler
warning. No conflict.

Signed-off-by: Martin KaFai Lau &lt;martin.lau@kernel.org&gt;
diff --git a/include/linux/filter.h b/include/linux/filter.h
@@ -1822,7 +1822,7 @@ static inline void bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned long off, voi
 
 static inline void *bpf_skb_meta_pointer(struct sk_buff *skb, u32 offset)
 {
-	return NULL;
+	return ERR_PTR(-EOPNOTSUPP);
 }
 #endif /* CONFIG_NET */
 

Original file line number	Diff line number	Diff line change
`@@ -1822,7 +1822,7 @@ static inline void bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned long off, voi`
`1822`	`1822`
`1823`	`1823`	`static inline void bpf_skb_meta_pointer(struct sk_buff skb, u32 offset)`
`1824`	`1824`	`{`
`1825`		`- return NULL;`
	`1825`	`+ return ERR_PTR(-EOPNOTSUPP);`
`1826`	`1826`	`}`
`1827`	`1827`	`#endif /* CONFIG_NET */`
`1828`	`1828`