[PATCH bpf-next] bpf: devmap: compute proper xdp_frame len redirecting frames

[PATCH bpf-next] bpf: devmap: compute proper xdp_frame len redirecting frames

[Lorenzo Bianconi]

Even if it is currently forbidden to XDP_REDIRECT a multi-frag xdp_frame
into a devmap, compute proper xdp_frame length in __xdp_enqueue and
is_valid_dst routines running xdp_get_frame_len().

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
 kernel/bpf/devmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
index 1400561efb15..a0e02b009487 100644
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -477,7 +477,7 @@ static inline int __xdp_enqueue(struct net_device *dev, struct xdp_frame *xdpf,
 	if (!dev->netdev_ops->ndo_xdp_xmit)
 		return -EOPNOTSUPP;
 
-	err = xdp_ok_fwd_dev(dev, xdpf->len);
+	err = xdp_ok_fwd_dev(dev, xdp_get_frame_len(xdpf));
 	if (unlikely(err))
 		return err;
 
@@ -536,7 +536,7 @@ static bool is_valid_dst(struct bpf_dtab_netdev *obj, struct xdp_frame *xdpf)
 	    !obj->dev->netdev_ops->ndo_xdp_xmit)
 		return false;
 
-	if (xdp_ok_fwd_dev(obj->dev, xdpf->len))
+	if (xdp_ok_fwd_dev(obj->dev, xdp_get_frame_len(xdpf)))
 		return false;
 
 	return true;
-- 
2.36.1

Re: [PATCH bpf-next] bpf: devmap: compute proper xdp_frame len redirecting frames

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:

On Sat, 23 Jul 2022 19:17:10 +0200 you wrote:
> Even if it is currently forbidden to XDP_REDIRECT a multi-frag xdp_frame
> into a devmap, compute proper xdp_frame length in __xdp_enqueue and
> is_valid_dst routines running xdp_get_frame_len().
> 
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
>  kernel/bpf/devmap.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Here is the summary with links:
  - [bpf-next] bpf: devmap: compute proper xdp_frame len redirecting frames
    https://git.kernel.org/bpf/bpf-next/c/bd82ea52f0ee

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html