From patchwork Fri Jul 7 18:21:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roopa Prabhu X-Patchwork-Id: 785700 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 3x42xy1MBtz9t2f for ; Sat, 8 Jul 2017 04:21:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="X7GPclrW"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751210AbdGGSVz (ORCPT ); Fri, 7 Jul 2017 14:21:55 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:36357 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751023AbdGGSVy (ORCPT ); Fri, 7 Jul 2017 14:21:54 -0400 Received: by mail-pg0-f43.google.com with SMTP id u62so20772623pgb.3 for ; Fri, 07 Jul 2017 11:21:54 -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; bh=mP9Kp7DgmUvUZ6WWPIv/E9dkjeb+fg1vuFg6b7D+PQE=; b=X7GPclrWoVqJATnGINBkweVVQVP2JK7VSoUIpXObZ3AUFjgvFAq2wOiWCpWgsmmEPB Et19qj/9UeXFA/Pb7EGEi4u4H3TnQc7EQWUloFsBmuWt6CHLJiOxnQaIiiWnelx18EPN Wj6ed7ulPH9wfWQpc9+xJAIejigCxe0nFWQig= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mP9Kp7DgmUvUZ6WWPIv/E9dkjeb+fg1vuFg6b7D+PQE=; b=tJ5GkYd4KkVwXBwBHIxCQD4cDnqNGtzfGSuWu1Z7tZSElKYorTWq9NzRuFM5R6O8/p rUjP2zyt4fHHgLPo2pp/01Tf2I1Sl1liUCDfi61l2lJx5nBx0+gCB1lzMvgakCPLefQO xqzZ9NODoGmqOjJuidg8Cv7s7L1z6xMtqu+vnuDUbyTF1Frq67nc/9hRKAxFheTfqjwf LNLOHM575pbRaafEMKsir6O/Jre+SGTSe80KlALpZ49J4VVbok7J7xsdStVHfxmLiaQ2 QKq4Im5x+4ZthOfy5wW9FRxIvV64IlImoC1PQKEF2Y6+Vrg8al+Cu3FcV8GnYPkmAH1d LrDA== X-Gm-Message-State: AIVw112Iw6a9ZIkbzlUkKIFmKFzdtUsh/8qFrCgNkS92DuivbjUaNGxt a/lG0y33ouhV2/A3 X-Received: by 10.98.10.68 with SMTP id s65mr32248937pfi.89.1499451713798; Fri, 07 Jul 2017 11:21:53 -0700 (PDT) Received: from hydra-01.mvlab.cumulusnetworks.com ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id e13sm7623152pfh.96.2017.07.07.11.21.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jul 2017 11:21:53 -0700 (PDT) From: Roopa Prabhu X-Google-Original-From: Roopa Prabhu To: davem@davemloft.net Cc: netdev@vger.kernel.org, dan.carpenter@oracle.com Subject: [PATCH net] mpls: fix uninitialized in_label var warning in mpls_getroute Date: Fri, 7 Jul 2017 11:21:49 -0700 Message-Id: <1499451709-7800-1-git-send-email-roopa@cumulusnetworks.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Roopa Prabhu Fix the below warning generated by static checker: net/mpls/af_mpls.c:2111 mpls_getroute() error: uninitialized symbol 'in_label'." Fixes: 397fc9e5cefe ("mpls: route get support") Reported-by: Dan Carpenter Signed-off-by: Roopa Prabhu --- net/mpls/af_mpls.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index bdcfb2d..ea4f4818 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -2076,6 +2076,7 @@ static int mpls_getroute(struct sk_buff *in_skb, struct nlmsghdr *in_nlh, { struct net *net = sock_net(in_skb->sk); u32 portid = NETLINK_CB(in_skb).portid; + u32 in_label = LABEL_NOT_SPECIFIED; struct nlattr *tb[RTA_MAX + 1]; u32 labels[MAX_NEW_LABELS]; struct mpls_shim_hdr *hdr; @@ -2086,9 +2087,8 @@ static int mpls_getroute(struct sk_buff *in_skb, struct nlmsghdr *in_nlh, struct nlmsghdr *nlh; struct sk_buff *skb; struct mpls_nh *nh; - int err = -EINVAL; - u32 in_label; u8 n_labels; + int err; err = nlmsg_parse(in_nlh, sizeof(*rtm), tb, RTA_MAX, rtm_mpls_policy, extack); @@ -2101,11 +2101,15 @@ static int mpls_getroute(struct sk_buff *in_skb, struct nlmsghdr *in_nlh, u8 label_count; if (nla_get_labels(tb[RTA_DST], 1, &label_count, - &in_label, extack)) + &in_label, extack)) { + err = -EINVAL; goto errout; + } - if (in_label < MPLS_LABEL_FIRST_UNRESERVED) + if (!mpls_label_ok(net, in_label, extack)) { + err = -EINVAL; goto errout; + } } rt = mpls_route_input_rcu(net, in_label);