Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1837273pxp; Mon, 7 Mar 2022 03:32:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJxnvm5qOn0CmtC295+h8WUzirXqWx/EeioJuIaiz1CKhiyqTBqzy2TS04GDJi/2oit+4kfs X-Received: by 2002:a05:6a00:a8f:b0:4e1:2619:11a2 with SMTP id b15-20020a056a000a8f00b004e1261911a2mr12255085pfl.53.1646652726455; Mon, 07 Mar 2022 03:32:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646652726; cv=none; d=google.com; s=arc-20160816; b=mpJU35p58TfKLG0TAPyV1ZVasMtFB/rz9ld+AmISI57BU8V+1EikqJ8d8ONvyI9Abl ErMSikRyR2//NiO6RW2fLJMlTbOnNdHqaqF9UZd/KrRbNgYnCLtcRp6F4maSqBAJ0fOW gpdZaPZWaf+tDgyNbrk1QzyXA7a6MO75ue5vBYscNexpdcqjSHRFfixceXkY9uFOZsYp bJBzr09DZ642/l0jiEBphlR9ukysloAQ7Gc8v542cVS57ufVM5SLdOBt0APjugGkCjTL nMx79i4LgObzKyU7UZhJ/xmFs6Z+mS1py3e5AN/Wub0CHkd/ZqgpZtrQbDsTjRnAVjqS 79DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=W+fE6WAgt109O1atOMtEF1HTsn/43ek7ZHjii4yxxt4=; b=W8SvywYiIQIsd4UVfRrVcokSaLTwAWd2TGzScQRwELP93umQb16scS5qTg3BJLx33z O2tLE/Xg4j3V8Yp7y5rwDDOIyRlAw/burVdU2FcR10wqpZCdk1vR5qiBWNfYLN5l8jDY F+wuwSjhlRD2dNPsRv/mW1j9JA8hg/i7riho7UYdHXhgxH0plWZz04GtlTULtqxN0L7i N1Y0h8nchLO33M2mKXksf9ofIqh+TefPItCWhcH6KbYQIaWDpECaPT+6QqRYv3A0weHy HB17g/JGfG+Pa2X2ak/3EDO0L8eUX5qqG0Kt4sVSQkXMvgvgjoqIKliLxgqBe1PPtdFV eUoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QiapoyeB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n75-20020a628f4e000000b004e1dc67eaa8si11885520pfd.306.2022.03.07.03.31.50; Mon, 07 Mar 2022 03:32:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QiapoyeB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241846AbiCGKVW (ORCPT + 99 others); Mon, 7 Mar 2022 05:21:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240460AbiCGKBD (ORCPT ); Mon, 7 Mar 2022 05:01:03 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 612BB640A; Mon, 7 Mar 2022 01:48:18 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2271EB80E70; Mon, 7 Mar 2022 09:48:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55FD8C340F3; Mon, 7 Mar 2022 09:48:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1646646495; bh=sSJ9MijLg3SmfJjvNlTQGY06f23cm8eCzf4ShJiXGRY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QiapoyeBfKYVJGUiq4XJXHEky7yBoTdJ53wrfAagr5XZhAoZ3EHeGrwolGPCgZcqS kntT0vz/Q1AK9EEgvgZtDJVPNG9U2vZpENPGT1m/0kwjTewlhw4W56ea6o6uXZO80c jZSujqje3zrZZGXQD8q4njWfb/1VIh7lHk0/jAbA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, TOTE Robot , Jia-Ju Bai , "David S. Miller" , Sasha Levin Subject: [PATCH 5.15 221/262] net: chelsio: cxgb3: check the return value of pci_find_capability() Date: Mon, 7 Mar 2022 10:19:25 +0100 Message-Id: <20220307091709.292534725@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307091702.378509770@linuxfoundation.org> References: <20220307091702.378509770@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jia-Ju Bai [ Upstream commit 767b9825ed1765894e569a3d698749d40d83762a ] The function pci_find_capability() in t3_prep_adapter() can fail, so its return value should be checked. Fixes: 4d22de3e6cc4 ("Add support for the latest 1G/10G Chelsio adapter, T3") Reported-by: TOTE Robot Signed-off-by: Jia-Ju Bai Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c index 7ff31d1026fb..e0d34e64fc6c 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c @@ -3678,6 +3678,8 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai, MAC_STATS_ACCUM_SECS : (MAC_STATS_ACCUM_SECS * 10); adapter->params.pci.vpd_cap_addr = pci_find_capability(adapter->pdev, PCI_CAP_ID_VPD); + if (!adapter->params.pci.vpd_cap_addr) + return -ENODEV; ret = get_vpd_params(adapter, &adapter->params.vpd); if (ret < 0) return ret; -- 2.34.1