From patchwork Wed Sep 23 15:15:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 521730 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 7FC0C1401DE for ; Thu, 24 Sep 2015 01:15:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b=Wklu6b+O; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755170AbbIWPPh (ORCPT ); Wed, 23 Sep 2015 11:15:37 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:35722 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752195AbbIWPPg (ORCPT ); Wed, 23 Sep 2015 11:15:36 -0400 Received: by pacfv12 with SMTP id fv12so43765032pac.2 for ; Wed, 23 Sep 2015 08:15:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RDmbRUP5mpLtCsFmY/pa8sdVhLyKboAQdQRTP82xbLg=; b=Wklu6b+OMDghORUTmkVIiGALLe+uhNV/mYBrzMsDnsxMVfH8TQ290J8w7cTSQS3/2q VHstAOWcpzQHlircjrD6czVUuPZFdolctpxqhP5+J7SSHBoGZ0huDDMqgeRU4pu7+40D z/33AmwNitXSm9k9ybrOQb56uyJLww8LSl1dw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RDmbRUP5mpLtCsFmY/pa8sdVhLyKboAQdQRTP82xbLg=; b=YUEqPr6vOVv8TrELnrFspjYkSOpphPFruoURJIYXPXcXQkFKiIAta7Bdjdak8c/zIt niZGvZGQiDBz6apPM4isPRzttXZj/6e85oPWzHkj+xl5akvNjYP9eVNTaH3bfIeOF+RL 1OH0Ys0LXtAS6w96MLLEfp4vYe79b9F6c4SoVvUXpqAtdlvU5Q48cKaXrf/1Zb2tnoPJ ZCv5aFru+eLIkhGvEDkFDaUP0MOrvZRQoU+JwSICRduFAnnQktB1QCE4mgohBP1WPulj 4xERxaYc9vfwYF653DG3pF9ulNHP5J0VTAg2TZQenoiNFuQ9XJm8u6aaxocfhcvuBRC7 qdDw== X-Gm-Message-State: ALoCoQkxL/y9ZirnvJe0+teAdMGZ6nP+/ja07kle2/8lYG3vm7bu7axlEqESF/XCvS8Fuzp3ryDR X-Received: by 10.66.248.162 with SMTP id yn2mr38548258pac.85.1443021335955; Wed, 23 Sep 2015 08:15:35 -0700 (PDT) Received: from monster-14.cumulusnetworks.com. ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id kv10sm8612854pbc.2.2015.09.23.08.15.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Sep 2015 08:15:34 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: David Ahern Subject: [PATCH net-next 1/9] net: Remove martian_source_keep_err goto label Date: Wed, 23 Sep 2015 08:15:14 -0700 Message-Id: <1443021322-48621-2-git-send-email-dsa@cumulusnetworks.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443021322-48621-1-git-send-email-dsa@cumulusnetworks.com> References: <1443021322-48621-1-git-send-email-dsa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org err is initialized to -EINVAL when it is declared. It is not reset until fib_lookup which is well after the 3 users of the martian_source jump. So resetting err to -EINVAL at martian_source label is not needed. Removing that line obviates the need for the martian_source_keep_err label so delete it. Signed-off-by: David Ahern --- net/ipv4/route.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 80f7c5b7b832..ef36dfed24da 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1760,7 +1760,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, err = fib_validate_source(skb, saddr, daddr, tos, 0, dev, in_dev, &itag); if (err < 0) - goto martian_source_keep_err; + goto martian_source; goto local_input; } @@ -1782,7 +1782,7 @@ out: return err; err = fib_validate_source(skb, saddr, 0, tos, 0, dev, in_dev, &itag); if (err < 0) - goto martian_source_keep_err; + goto martian_source; } flags |= RTCF_BROADCAST; res.type = RTN_BROADCAST; @@ -1858,8 +1858,6 @@ out: return err; goto out; martian_source: - err = -EINVAL; -martian_source_keep_err: ip_handle_martian_source(dev, in_dev, skb, daddr, saddr); goto out; }