Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp3728684rdb; Sun, 10 Dec 2023 19:14:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IGpXrl9dzlFMjXlQiTvlsWfwCW4sp1i6BcXT5OcQOuUQvc0NhbU+Gwm/bZqmyki1hemtqhn X-Received: by 2002:a05:6870:bb1b:b0:1fb:27ca:738c with SMTP id nw27-20020a056870bb1b00b001fb27ca738cmr3346987oab.17.1702264441696; Sun, 10 Dec 2023 19:14:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702264441; cv=none; d=google.com; s=arc-20160816; b=tqm5zuBtxMyseuiZnRzR+vNsDyemXrxyWe/vou9aX4tCQTPa/69HcAKTnNbqgc+/8K bpEUqsYDmELt7nl0yBb4p1mmkHImiHimjUq7fy7LXPNBc8lqnhQvfdtM89lkzjLtqlnf 2UV5YpZMPyORRVjXBwErLfKHAjp1cULMCxw+ivMhITpu3HeJWNFmCaDsHZhCXc9nyJie AfQgTx08oZvaIJ312vROHixvnO+fvT+OftBVU/yE+S63ryG9Ojpe8QdnIs9mYbJcO13A DiwugtQbJE5dMzcGjxDTuPqBm9PzC5+lQWYEBo1h3BymjKYJO1R67OQsre+d67SkTNHA te+A== 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 :message-id:date:subject:cc:to:from; bh=0fQeciZ7H3Osj2bYaOMPUnfnDCNUSmzTWg9fj5SX4K0=; fh=BGRxrkfGVuH1vwaTE7h7o0qAEHz+H7n7hzW6m74zBa0=; b=msR0vXDrR5Er/MN16DmVu74tCTyZUtblCOELtdl6bzwAFys9CIKze+w2n5dklkLyF0 I1L54yVlEEH/ueGDbkImqcOFOmwV3Mf8FZmnRUcLR9+ZidXdouAjycfGAet8k0rR4ek+ MoAWlXn2FHY2HEmPZxurHSlIjJi2LOqr9m9Aqj9Fz7cTEbIMhH8qjvyzrURnxQMKjWy0 HkKDJxY2ZXpPQzW+AmGis+1V4n6DBlVENcVZQRESaxtl3heaJzIpjqLzJHBPB5f9r2nV wA3XyXLD+e6XuyH2je9SDjKgBJJazv/HTC7y5g8WC9jkhDxMTaHaLvyCfeyTybv7+2ib i0vA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id u24-20020a631418000000b005c677224c92si5311326pgl.522.2023.12.10.19.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 19:14:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 8B1248075DE6; Sun, 10 Dec 2023 19:13:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229778AbjLKDNp (ORCPT + 99 others); Sun, 10 Dec 2023 22:13:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229448AbjLKDNp (ORCPT ); Sun, 10 Dec 2023 22:13:45 -0500 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 119109D; Sun, 10 Dec 2023 19:13:50 -0800 (PST) X-UUID: b0aed6746fa9462dbc846b22f61b057a-20231211 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.33,REQID:62e02d26-f187-4327-b2ae-62bc0e600995,IP:5,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:-15 X-CID-INFO: VERSION:1.1.33,REQID:62e02d26-f187-4327-b2ae-62bc0e600995,IP:5,URL :0,TC:0,Content:-5,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-15 X-CID-META: VersionHash:364b77b,CLOUDID:5c8e0a61-c89d-4129-91cb-8ebfae4653fc,B ulkID:231211111344YBK1WEVE,BulkQuantity:0,Recheck:0,SF:17|19|44|66|38|24|1 02,TC:nil,Content:0,EDM:-3,IP:-2,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,CO L:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI X-UUID: b0aed6746fa9462dbc846b22f61b057a-20231211 X-User: chentao@kylinos.cn Received: from vt.. [(116.128.244.169)] by mailgw (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1392175482; Mon, 11 Dec 2023 11:13:41 +0800 From: Kunwu Chan To: jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: jacob.e.keller@intel.com, przemyslaw.kitszel@intel.com, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Kunwu Chan , Kunwu Chan Subject: [PATCH] igb: Add null pointer check to igb_set_fw_version Date: Mon, 11 Dec 2023 11:13:36 +0800 Message-Id: <20231211031336.235634-1-chentao@kylinos.cn> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sun, 10 Dec 2023 19:13:59 -0800 (PST) kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure. Fixes: 1978d3ead82c ("intel: fix string truncation warnings") Cc: Kunwu Chan Signed-off-by: Kunwu Chan --- drivers/net/ethernet/intel/igb/igb_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index b2295caa2f0a..6838f6fccb80 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -3102,6 +3102,8 @@ void igb_set_fw_version(struct igb_adapter *adapter) break; } + if (!lbuf) + return; /* the truncate happens here if it doesn't fit */ strscpy(adapter->fw_version, lbuf, sizeof(adapter->fw_version)); kfree(lbuf); -- 2.39.2