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=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 EF0E4C433DF for ; Thu, 28 May 2020 14:56:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C63322075F for ; Thu, 28 May 2020 14:56:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="E48ktRux" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403779AbgE1O4C (ORCPT ); Thu, 28 May 2020 10:56:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391336AbgE1Oz7 (ORCPT ); Thu, 28 May 2020 10:55:59 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18B9BC08C5C8 for ; Thu, 28 May 2020 07:55:59 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id t18so14176423wru.6 for ; Thu, 28 May 2020 07:55:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=EneWOSiakfCEBaGnxTPG1pDLBtx0joXUVr4u5ehgW3o=; b=E48ktRuxhpbVEBsogPQwIhCX+QdVASFipvgGxF9Jh2+6mBhSWXz+xMMaAOTNP6CyPe 9ztFbUVfCr/1IU06ipTsV+cU/HKxibCQAiBxazot2AGMjqj/UtJjY5b/6cyFlG0FktES CjEqaPrDQ3Zwh3yN54NVP7gE5yXe1oyl6Wgz4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=EneWOSiakfCEBaGnxTPG1pDLBtx0joXUVr4u5ehgW3o=; b=c17koVioJIcu6S8g1FiB7JQHJuMsAMTdkx+wLU6c3QdCsF5dKsDBAD5Gx8tT9Yszz1 Zi9AEsB6Sy5OanXiiHoL4xCBOHY6KupHvN64VVIYKz9VxxCp5KfCnZ4N7bL4J1fe7TdP eLiJWmTbwq79ogj+dDIsn5PO8pDB3W7Fl1+CODg1bBbFcdVYnqy7X4yMvTRHTJxgXdgj UdpXCnYNorezeU+1CHk7+NFQ7Ixp8Ud8HuTLKCCi41FF3HefbUeAUIg/5+Na1PeggUt+ oM1PyGurTvFsat395dg+6EySiRGeD+X1GzIc1bI0St2MOPodfQMWgH1kxNLbWkkuVPfF 1g+g== X-Gm-Message-State: AOAM532gHQee0qN+H3SKfM9R8ALqeGRbHyA04USjGyXuXjRWtBEkAKgv E0CAnyVSVqYNZzotX0yDfptUCk+Za524wQ== X-Google-Smtp-Source: ABdhPJzQUq72JztGH2vQBnYxdj0ih8RSMgb5VMRbG33nWrvt2fkhWG9C9dpWueI/PvK7ArgQjpCE8Q== X-Received: by 2002:a05:6000:1192:: with SMTP id g18mr4141547wrx.326.1590677757388; Thu, 28 May 2020 07:55:57 -0700 (PDT) Received: from [192.168.51.243] ([78.128.78.220]) by smtp.gmail.com with ESMTPSA id y37sm7276009wrd.55.2020.05.28.07.55.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 28 May 2020 07:55:56 -0700 (PDT) Subject: Re: [PATCH][net-next] nexthop: fix incorrect allocation failure on nhg->spare From: Nikolay Aleksandrov To: Colin King , David Ahern , "David S . Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , Jakub Kicinski , netdev@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org References: <20200528145114.420100-1-colin.king@canonical.com> <8b73e872-c05e-e93f-1d2d-3466da4ddbcc@cumulusnetworks.com> Message-ID: Date: Thu, 28 May 2020 17:55:55 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <8b73e872-c05e-e93f-1d2d-3466da4ddbcc@cumulusnetworks.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 28/05/2020 17:53, Nikolay Aleksandrov wrote: > On 28/05/2020 17:51, Colin King wrote: >> From: Colin Ian King >> >> The allocation failure check for nhg->spare is currently checking >> the pointer nhg rather than nhg->spare which is never false. Fix >> this by checking nhg->spare instead. >> >> Addresses-Coverity: ("Logically dead code") >> Fixes: 430a049190de ("nexthop: Add support for nexthop groups") >> Signed-off-by: Colin Ian King >> --- >> net/ipv4/nexthop.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c >> index ebafa5ed91ac..97423d6f2de9 100644 >> --- a/net/ipv4/nexthop.c >> +++ b/net/ipv4/nexthop.c >> @@ -1185,7 +1185,7 @@ static struct nexthop *nexthop_create_group(struct net *net, >> >> /* spare group used for removals */ >> nhg->spare = nexthop_grp_alloc(num_nh); >> - if (!nhg) { >> + if (!nhg->spare) { >> kfree(nhg); >> kfree(nh); >> return NULL; >> > > Good catch, embarrassing copy paste error :-/ > Acked-by: Nikolay Aleksandrov > Wait - that should be targeted at -net, that's where the fixes went. And the fixes tag is wrong, nhg->spare was very recently added by: commit 90f33bffa382 Author: Nikolay Aleksandrov Date: Tue May 26 12:56:15 2020 -0600 nexthops: don't modify published nexthop groups