From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43744C35666 for ; Fri, 21 Feb 2020 19:53:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 18FFE207FD for ; Fri, 21 Feb 2020 19:53:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582314795; bh=U6JmjUuAlTNd2GybDKXMr207vVx6gtGOnqZPR+UVbyI=; h=From:To:Cc:Subject:Date:List-ID:From; b=bBFSCx256hz59IK2IX5+JPWcfw7/rgIpdb1Iiq+FfI5WLT2Gjswaeq0PGmUL8JAEO u0thXNkgVbnhfgQQ3n1czef81oyz2BzcIpAgrdt7bW+OO5soynq6p4BNm1t+es5T+p 4pWuuGq26oFzjtMqeLe3Vu63W8gFhNE786sRW/wA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727211AbgBUTxO (ORCPT ); Fri, 21 Feb 2020 14:53:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:44390 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728019AbgBUTxN (ORCPT ); Fri, 21 Feb 2020 14:53:13 -0500 Received: from C02YQ0RWLVCF.internal.digitalocean.com (c-73-181-34-237.hsd1.co.comcast.net [73.181.34.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DBD2A20722; Fri, 21 Feb 2020 19:53:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582314793; bh=U6JmjUuAlTNd2GybDKXMr207vVx6gtGOnqZPR+UVbyI=; h=From:To:Cc:Subject:Date:From; b=zsV/Fv6IuWWv+gUnS4y5SoLmSxvxY1+gpTxBLpMAkOGySxKQ/KmZZQRg5NH/8CFgL Pleb0kboqlJLxIn67D6YtsKTMijW45AJObobhTtWoAb5jODvwI9ufdXyy+7uq7TrSg oAwHktPdB7zkIvgNvnH8fDcp+D2+8P1kfV/7soAw= From: David Ahern To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, David Ahern , Jason Wang Subject: [PATCH] tun: Remove unnecessary BUG_ON check in tun_net_xmit Date: Fri, 21 Feb 2020 12:53:09 -0700 Message-Id: <20200221195309.72955-1-dsahern@kernel.org> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern 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 Signed-off-by: David Ahern --- drivers/net/tun.c | 2 -- 1 file changed, 2 deletions(-) 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. */ -- 2.17.1