lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 4 Mar 2022 06:55:06 -0800 From: Dongli Zhang <dongli.zhang@...cle.com> To: netdev@...r.kernel.org, bpf@...r.kernel.org Cc: linux-kernel@...r.kernel.org, davem@...emloft.net, kuba@...nel.org, rostedt@...dmis.org, mingo@...hat.com, ast@...nel.org, daniel@...earbox.net, andrii@...nel.org, imagedong@...cent.com, joao.m.martins@...cle.com, joe.jin@...cle.com, dsahern@...il.com, edumazet@...gle.com Subject: [PATCH net-next v6 2/3] net: tun: split run_ebpf_filter() and pskb_trim() into different "if statement" No functional change. Just to split the if statement into different conditions to use kfree_skb_reason() to trace the reason later. Cc: Joao Martins <joao.m.martins@...cle.com> Cc: Joe Jin <joe.jin@...cle.com> Signed-off-by: Dongli Zhang <dongli.zhang@...cle.com> Reviewed-by: David Ahern <dsahern@...nel.org> --- drivers/net/tun.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 2a0d8a5d7aec..6e06c846fe82 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1086,7 +1086,10 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) goto drop; len = run_ebpf_filter(tun, skb, len); - if (len == 0 || pskb_trim(skb, len)) + if (len == 0) + goto drop; + + if (pskb_trim(skb, len)) goto drop; if (unlikely(skb_orphan_frags_rx(skb, GFP_ATOMIC))) -- 2.17.1
Powered by blists - more mailing lists