Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp2520066rdb; Sun, 3 Dec 2023 22:23:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IEC6tKvWYV81+NJV+FszbWhnY0y4vm8XSi9shgOpwdWB6rg1SpvjwriLNRMD6h4/upt0q+p X-Received: by 2002:a17:902:bd48:b0:1d0:aee3:59fd with SMTP id b8-20020a170902bd4800b001d0aee359fdmr379496plx.55.1701671020676; Sun, 03 Dec 2023 22:23:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701671020; cv=none; d=google.com; s=arc-20160816; b=yxz86Xe+53WEk4W8F1xc/16WRRmPaRFmXeGDXmIMiv3yKqyX2Y1mNR2XUa2d8q+AmC 5n7+GOfLrr6v9GPLvH4Kf+Tc5nAxQRCEvtLjhBZlrjC2vx9xaU0ZKbc0XZZgqcLWOU20 9JvypZM2LKX1wPr0c8PZQ25t81PKfprEUYZ2vY7hA2M3SaTvMFHC8x+64EMnhTHVt44Q j8cqHPnJRpthj+PUUw1U5wpsHhQHuH3TYttQBxgEcPlqphuGIms5nie0LEZf9UYi5sx0 +3A4idITKnyqlBD8CwTtFIpIzMwMo3LGLoEfFuNpzfjtBFUUKUYruYwFoyNBE0zsAPFt XHqA== 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=2cJObDR63e8gu9QTfvMVQoleuqCTdxwPfCSl8T8L+IQ=; fh=FdJOIsRO+u2wNuJqWH0z99HT7wChHW4dIVDjg0ZR7Bs=; b=nIIgAU7SuWj+0qoRgB7ZwORZ0Ei/+AzhIv+jH+ODPnK6lOsncBegCxiBsHy/bGl66a ONgCKYfad2Hcr2HTWK3qR2foRxa2EYz+HNsMJs7qZr53s+6gxhl7SzCkZlsPLSYCx41N z3+psunpKBaTPinqw4kVYApRaxHV2Di2rhUTXjG64PzdcjTpWVNgKKBkme9w1PIMNg1n exHZuxbEicyUHQBxDzEd1hfCwtKSJl4voKmVu8zAG0/0sJzNCa6Cot9S5+mTDMpr2gC8 KCTD+i48kzK6gW9HHGr7sQPnUSvgOfMCvbdlkU2s+PAzy+cflwUMYZuLO2UYbXCZZ4ao 4TCw== 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:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id b14-20020a170902d50e00b001d0acd492fasi832254plg.512.2023.12.03.22.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 22:23:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id 7411980491C0; Sun, 3 Dec 2023 22:23:38 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229869AbjLDGXK (ORCPT + 99 others); Mon, 4 Dec 2023 01:23:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229446AbjLDGXJ (ORCPT ); Mon, 4 Dec 2023 01:23:09 -0500 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0139DF; Sun, 3 Dec 2023 22:23:13 -0800 (PST) X-UUID: dc1967f88d7547b9bb334034848caa36-20231204 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.33,REQID:f20d8732-0eeb-4bee-8f43-b9fd4762c27a,IP:5,U RL:0,TC:0,Content:0,EDM:-30,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACT ION:release,TS:-40 X-CID-INFO: VERSION:1.1.33,REQID:f20d8732-0eeb-4bee-8f43-b9fd4762c27a,IP:5,URL :0,TC:0,Content:0,EDM:-30,RT:0,SF:-15,FILE:0,BULK:0,RULE:EDM_GN8D19FE,ACTI ON:release,TS:-40 X-CID-META: VersionHash:364b77b,CLOUDID:75ba5f73-1bd3-4f48-b671-ada88705968c,B ulkID:231204142249O93CDZ8U,BulkQuantity:0,Recheck:0,SF:66|38|24|17|19|44|1 02,TC:nil,Content:0,EDM:2,IP:-2,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL :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_FSI,TF_CID_SPAM_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD X-UUID: dc1967f88d7547b9bb334034848caa36-20231204 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 559205209; Mon, 04 Dec 2023 14:22:48 +0800 From: Kunwu Chan To: bhelgaas@google.com, lizhi.hou@amd.com, robh@kernel.org Cc: kunwu.chan@hotmail.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Kunwu Chan Subject: [PATCH] PCI: Fix null pointer dereference in of_pci_prop_compatible Date: Mon, 4 Dec 2023 14:22:45 +0800 Message-Id: <20231204062245.2453512-1-chentao@kylinos.cn> X-Mailer: git-send-email 2.34.1 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 pete.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 (pete.vger.email [0.0.0.0]); Sun, 03 Dec 2023 22:23:38 -0800 (PST) kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure. Fixes: 407d1a51921e ("PCI: Create device tree node for bridge") Signed-off-by: Kunwu Chan --- drivers/pci/of_property.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c index c2c7334152bc..5e16bbff3ba4 100644 --- a/drivers/pci/of_property.c +++ b/drivers/pci/of_property.c @@ -304,6 +304,11 @@ static int of_pci_prop_compatible(struct pci_dev *pdev, compat_strs[PROP_COMPAT_PCICLASS_CCSS] = kasprintf(GFP_KERNEL, "pciclass,%04x", pdev->class >> 8); + if (!compat_strs[PROP_COMPAT_PCI_VVVV_DDDD] || + !compat_strs[PROP_COMPAT_PCICLASS_CCSSPP] || + !compat_strs[PROP_COMPAT_PCICLASS_CCSS]) + return -ENOMEM; + ret = of_changeset_add_prop_string_array(ocs, np, "compatible", compat_strs, PROP_COMPAT_NUM); for (i = 0; i < PROP_COMPAT_NUM; i++) -- 2.34.1