From patchwork Mon Mar 30 21:13:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 456340 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 B235A1400B6 for ; Tue, 31 Mar 2015 08:16:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753523AbbC3VNj (ORCPT ); Mon, 30 Mar 2015 17:13:39 -0400 Received: from mailrelay107.isp.belgacom.be ([195.238.20.134]:48291 "EHLO mailrelay107.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753378AbbC3VNh (ORCPT ); Mon, 30 Mar 2015 17:13:37 -0400 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=pojTLeLEEG+IB9MeyQ9xnWKWJHiyH+4Hnj5iAYu/pCk= c=1 sm=2 a=RCRHV_qGPpsY8ZEG68cA:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CzBgDBuxlV/yA2QFdcgwaBLrIWAQEBAQEBBQF7mBYCgTxNAQEBAQEBfYQVAQUnLyMQUTkeGYgzAcwMAQEBByKGD4oSBxaEFwWaUIs7iHoig3A8MYJDAQEB Received: from 32.54-64-87.adsl-dyn.isp.belgacom.be (HELO localhost.home.) ([87.64.54.32]) by relay.skynet.be with ESMTP; 30 Mar 2015 23:13:36 +0200 From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , Steffen Klassert , Herbert Xu , Pablo Neira Ayuso , Jozsef Kadlecsik , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org Subject: [PATCH 4/9 net-next] ipv6: replace if/BUG by BUG_ON Date: Mon, 30 Mar 2015 23:13:12 +0200 Message-Id: <1427749998-28464-4-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427749998-28464-1-git-send-email-fabf@skynet.be> References: <1427749998-28464-1-git-send-email-fabf@skynet.be> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Fabian Frederick --- net/ipv6/addrconf.c | 3 +-- net/ipv6/esp6.c | 3 +-- net/ipv6/netfilter/nf_conntrack_reasm.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 2660263..e205918 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -4805,8 +4805,7 @@ static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla) if (!idev) return -EAFNOSUPPORT; - if (nla_parse_nested(tb, IFLA_INET6_MAX, nla, NULL) < 0) - BUG(); + BUG_ON(nla_parse_nested(tb, IFLA_INET6_MAX, nla, NULL) < 0); if (tb[IFLA_INET6_TOKEN]) { err = inet6_set_iftoken(idev, nla_data(tb[IFLA_INET6_TOKEN])); diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index e48f2c7..9e51b69 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -280,8 +280,7 @@ static int esp_input_done2(struct sk_buff *skb, int err) if (unlikely(err)) goto out; - if (skb_copy_bits(skb, skb->len - alen - 2, nexthdr, 2)) - BUG(); + BUG_ON(skb_copy_bits(skb, skb->len - alen - 2, nexthdr, 2)); err = -EINVAL; padlen = nexthdr[0]; diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 6f187c8..cea1a4a 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -538,8 +538,7 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff) pr_debug("too short\n"); return -1; } - if (skb_copy_bits(skb, start, &hdr, sizeof(hdr))) - BUG(); + BUG_ON(skb_copy_bits(skb, start, &hdr, sizeof(hdr))); if (nexthdr == NEXTHDR_AUTH) hdrlen = (hdr.hdrlen+2)<<2; else