From patchwork Mon Oct 10 16:52:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: danborkmann@iogearbox.net X-Patchwork-Id: 118790 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B6A85B71AB for ; Tue, 11 Oct 2011 03:56:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753332Ab1JJQzq (ORCPT ); Mon, 10 Oct 2011 12:55:46 -0400 Received: from www62.your-server.de ([213.133.104.62]:34990 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753076Ab1JJQzo (ORCPT ); Mon, 10 Oct 2011 12:55:44 -0400 Received: from [78.46.5.208] (helo=webmail01.your-server.de) by www62.your-server.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1RDJ8g-0004Lj-Oo; Mon, 10 Oct 2011 18:55:42 +0200 Received: from pc-10089.ethz.ch (pc-10089.ethz.ch [82.130.102.59]) by mail.your-server.de (Horde Framework) with HTTP; Mon, 10 Oct 2011 18:52:46 +0200 Message-ID: <20111010185246.15533bv1p3pmnba6@mail.your-server.de> Date: Mon, 10 Oct 2011 18:52:46 +0200 From: danborkmann@iogearbox.net To: Eric Dumazet , "David S. Miller" Cc: "netdev@vger.kernel.org" Subject: [PATCH] af_packet: remove unnecessary BUG_ON() in tpacket_destruct_skb MIME-Version: 1.0 Content-Disposition: inline User-Agent: Dynamic Internet Messaging Program (DIMP) H3 (1.1.6) X-Authenticated-Sender: danborkmann@iogearbox.net X-Virus-Scanned: Clear (ClamAV 0.97.2/13777/Mon Oct 10 17:22:30 2011) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If skb is NULL, then stack trace is thrown anyway on dereference. Therefore, the stack trace triggered by BUG_ON is duplicate. Signed-off-by: Daniel Borkmann Cc: Eric Dumazet Acked-by: Eric Dumazet --- net/packet/af_packet.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index fabb4fa..886ae50 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1170,8 +1170,6 @@ static void tpacket_destruct_skb(struct sk_buff *skb) struct packet_sock *po = pkt_sk(skb->sk); void *ph; - BUG_ON(skb == NULL); - if (likely(po->tx_ring.pg_vec)) { ph = skb_shinfo(skb)->destructor_arg; BUG_ON(__packet_get_status(po, ph) != TP_STATUS_SENDING);