diff mbox series

tun: Remove unnecessary BUG_ON check in tun_net_xmit

Message ID 20200221195309.72955-1-dsahern@kernel.org
State Accepted
Delegated to: David Miller
Headers show
Series tun: Remove unnecessary BUG_ON check in tun_net_xmit | expand

Commit Message

David Ahern Feb. 21, 2020, 7:53 p.m. UTC 
From: David Ahern <dsahern@gmail.com>

The BUG_ON for NULL tfile is now redundant due to a recently
added null check after the rcu_dereference. Remove the BUG_ON.

Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
---
 drivers/net/tun.c | 2 --
 1 file changed, 2 deletions(-)

Comments

David Ahern Feb. 21, 2020, 7:54 p.m. UTC | #1 
On 2/21/20 12:53 PM, David Ahern wrote:
> From: David Ahern <dsahern@gmail.com>
> 
> The BUG_ON for NULL tfile is now redundant due to a recently
> added null check after the rcu_dereference. Remove the BUG_ON.
> 
> Cc: Jason Wang <jasowang@redhat.com>
> Signed-off-by: David Ahern <dsahern@gmail.com>
> ---
>  drivers/net/tun.c | 2 --
>  1 file changed, 2 deletions(-)
> 

D'oh. Forgot the net-next  label
David Miller Feb. 24, 2020, 12:41 a.m. UTC | #2 
From: David Ahern <dsahern@kernel.org>
Date: Fri, 21 Feb 2020 12:53:09 -0700

> From: David Ahern <dsahern@gmail.com>
> 
> The BUG_ON for NULL tfile is now redundant due to a recently
> added null check after the rcu_dereference. Remove the BUG_ON.
> 
> Cc: Jason Wang <jasowang@redhat.com>
> Signed-off-by: David Ahern <dsahern@gmail.com>

Applied to net-next, thanks David.
diff mbox series

Patch

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 650c937ed56b..79f248cb282d 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1078,8 +1078,6 @@  static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	tun_debug(KERN_INFO, tun, "tun_net_xmit %d\n", skb->len);
 
-	BUG_ON(!tfile);
-
 	/* Drop if the filter does not like it.
 	 * This is a noop if the filter is disabled.
 	 * Filter can be enabled only for the TAP devices. */