2017-07-13 06:29:54

by Kefeng Wang

Subject: [PATCH] bpf: fix return in bpf_skb_adjust_net

The bpf_skb_adjust_net() ignores the return value of bpf_skb_net_shrink/grow,
and always return 0, fix it by return 'ret'.

Signed-off-by: Kefeng Wang <[email protected]>
---
net/core/filter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/filter.c b/net/core/filter.c
index c7f7370..f44fc22 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2248,7 +2248,7 @@ static int bpf_skb_adjust_net(struct sk_buff *skb, s32 len_diff)
bpf_skb_net_grow(skb, len_diff_abs);

bpf_compute_data_end(skb);
- return 0;
+ return ret;
}

BPF_CALL_4(bpf_skb_adjust_room, struct sk_buff *, skb, s32, len_diff,
--
1.8.3.1

2017-07-13 09:21:05

by Daniel Borkmann

Subject: Re: [PATCH] bpf: fix return in bpf_skb_adjust_net

On 07/13/2017 08:27 AM, Kefeng Wang wrote:
> The bpf_skb_adjust_net() ignores the return value of bpf_skb_net_shrink/grow,
> and always return 0, fix it by return 'ret'.
>
> Signed-off-by: Kefeng Wang <[email protected]>

Sigh, yep of course. Thanks!

Acked-by: Daniel Borkmann <[email protected]>

2017-07-13 16:19:42

by David Miller

Subject: Re: [PATCH] bpf: fix return in bpf_skb_adjust_net

From: Kefeng Wang <[email protected]>
Date: Thu, 13 Jul 2017 14:27:58 +0800

> The bpf_skb_adjust_net() ignores the return value of bpf_skb_net_shrink/grow,
> and always return 0, fix it by return 'ret'.
>
> Signed-off-by: Kefeng Wang <[email protected]>

Applied, thanks.