diff mbox

bpf: fix return in bpf_skb_adjust_net

Message ID 1499927278-175876-1-git-send-email-wangkefeng.wang@huawei.com
State Accepted
Commit e4a6a3424b75f23f6bb1cc479974fc305a4b9f78
Headers show

Commit Message

Kefeng Wang July 13, 2017, 6:27 a.m. UTC
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 <wangkefeng.wang@huawei.com>

---
 net/core/filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.8.3.1

Comments

Daniel Borkmann July 13, 2017, 9:20 a.m. UTC | #1
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 <wangkefeng.wang@huawei.com>


Sigh, yep of course. Thanks!

Acked-by: Daniel Borkmann <daniel@iogearbox.net>
David Miller July 13, 2017, 4:19 p.m. UTC | #2
From: Kefeng Wang <wangkefeng.wang@huawei.com>

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 <wangkefeng.wang@huawei.com>


Applied, thanks.
diff mbox

Patch

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,