diff options
| author | Dongli Zhang <dongli.zhang@oracle.com> | 2022-03-04 06:55:06 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-29 17:25:11 +0200 |
| commit | d2dba226acb9baed97a714e0f7f81a89b2feb63b (patch) | |
| tree | 67b90939055d5f09c1504fc4e6b8275c1798021d /drivers/net/tun.c | |
| parent | f52af853be7ac96ba8ced03c9136297fe5843b0b (diff) | |
net: tun: split run_ebpf_filter() and pskb_trim() into different "if statement"
[ Upstream commit 45a15d89fbcd280571eba8e5ca309e14ba6afa8f ]
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@oracle.com>
Cc: Joe Jin <joe.jin@oracle.com>
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index ea60453fe69a..f92d6a12831f 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1097,7 +1097,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))) |