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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 96DD3C433E0 for ; Mon, 1 Jun 2020 11:12:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7217A206E2 for ; Mon, 1 Jun 2020 11:12:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QPgCYOdW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726555AbgFALMO (ORCPT ); Mon, 1 Jun 2020 07:12:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725788AbgFALML (ORCPT ); Mon, 1 Jun 2020 07:12:11 -0400 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 563A7C061A0E; Mon, 1 Jun 2020 04:12:11 -0700 (PDT) Received: by mail-ed1-x544.google.com with SMTP id l1so6105591ede.11; Mon, 01 Jun 2020 04:12:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=czTuxz2CoTD0fHv9cb/RIUM0+nflo6a9HHpNnue05Fg=; b=QPgCYOdW18MdnNvpGvIIqghpVZt0hwClQx6lTBAY1h1dTlbx7kJzCnRlXPGQVeyrFt VA3i1DGARrsHLL37y8Ap5Cc7UfBlT+VVKOd6eg2mjpSOSd4jeuSWWB2Abn9838dbhZ0r bEraHOxVj0yanqSDO/2IWh93JQRpxGIT0s0Nzk/mD2TfLaplOfTHA5KMMi1unhGbKtWC k8U/+JM51LrpC5j3t03A0yYP9qlGml1XX+Qe3/Idm4qNV8VI3oy1XkCE+2621Ip3IMBx 3l/8Z7V/xBTXs2Xb3ZxJudvlA7LZX2hC8n+/+2tPuDorJCK1b/fpMdZwB5EkCoRsdduf +xjQ== 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:mime-version :content-transfer-encoding; bh=czTuxz2CoTD0fHv9cb/RIUM0+nflo6a9HHpNnue05Fg=; b=hdJNY5TMmL5DCLLZ6i8p5juneQ8ERXSnmBISQUdWovw7FyweRbGn4xHZpkV8sBI42A gl99qCXj30E6mFwMtBZAhiy9nVXGjFn5h+pd/oANocl24VqgPONeLf/gTGJHdpxKw8Gu piy6qH4YXzw/dwnQI3fjnTi4VU/PF71WmI/lfUcWjkk29VUzPla439oUGvfbfT7q57V9 PKi0iSekzKSFWstK+PUj6/+v/UUxFDjHyv1YhFlNXgRy1b8njcMjLKctmNXQbaVwWe2A b0muHvzptzta85ciy01OitMUz+XX0pgUCQyghXyVkx4IKoR46JsSWwE0Dnj4XvbohqyB HT3g== X-Gm-Message-State: AOAM5331Nq4aJpIYHhBTLe3Cc8PjMrFX7Z6xGjGiAmXMs2P+WcLCpY7S Im6IDpX4WXnajgVDEJrAvp4= X-Google-Smtp-Source: ABdhPJx8nJJQm81YEZpmsWNF28u/VBUFA9tk5tgTNRmrEi/WfOhCo400cNlidSnNiRBjvYuOS3fGeg== X-Received: by 2002:a50:ee18:: with SMTP id g24mr14329517eds.370.1591009930136; Mon, 01 Jun 2020 04:12:10 -0700 (PDT) Received: from X1000-Arch.fritz.box ([2001:171b:2272:c620:bc2a:b7:554a:5740]) by smtp.gmail.com with ESMTPSA id 13sm14504017ejh.65.2020.06.01.04.12.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 04:12:09 -0700 (PDT) From: patrickeigensatz@gmail.com X-Google-Original-From: patrick.eigensatz@gmail.com To: David Ahern Cc: Nikolay Aleksandrov , Patrick Eigensatz , Coverity , "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , Jakub Kicinski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ipv4: nexthop: Fix deadcode issue by performing a proper NULL check Date: Mon, 1 Jun 2020 13:12:01 +0200 Message-Id: <20200601111201.64124-1-patrick.eigensatz@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Patrick Eigensatz After allocating the spare nexthop group it should be tested for kzalloc() returning NULL, instead the already used nexthop group (which cannot be NULL at this point) had been tested so far. Additionally, if kzalloc() fails, return ERR_PTR(-ENOMEM) instead of NULL. Coverity-id: 1463885 Reported-by: Coverity Signed-off-by: Patrick Eigensatz --- net/ipv4/nexthop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c index 563f71bcb2d7..cb9412cd5e4b 100644 --- a/net/ipv4/nexthop.c +++ b/net/ipv4/nexthop.c @@ -1118,10 +1118,10 @@ 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; + return ERR_PTR(-ENOMEM); } nhg->spare->spare = nhg; -- 2.26.2