From patchwork Thu Nov 21 09:40:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 13881807 X-Patchwork-Delegate: kw@linux.com Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 002C11C4A08 for ; Thu, 21 Nov 2024 09:40:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732182038; cv=none; b=l91rEhz00ff+hiEUfwDz5DHRYUJw11br6LaN48kBq+EPS5EF+3VVIJEUjvqdl9CasC1tBSgLSKVfUEXQPKRtoWUgScXcT/HntZo1u3G4nOda6tKPEVg2CMucJdrQiaARweQW5n5VhV7jsQChstN2UF+tWCXJgDDkzRaXAT5sCUw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732182038; c=relaxed/simple; bh=B8w7IqS349xKvkVm2TAGzPcrpQkbEaSMjvOYJjFtRWY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=lZwv2z6TFy4ccy8NS8yZIikFzvUd6ELm/JcaM1flkPV4N9E1YW5tz6GkEd+SRl4yB1Iaw+HF2JNTiVi/pH0kbh/oe0IEFzzsir5Upmqn0HK2+3BB5r5hf4KNhZIotYO8txk3arCHJaXcRdXJFizvn90LY97KxvTiw9861N1tEKE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=SyV7K3Hs; arc=none smtp.client-ip=209.85.215.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="SyV7K3Hs" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-7eda47b7343so569379a12.0 for ; Thu, 21 Nov 2024 01:40:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732182036; x=1732786836; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=DQA02CvD4hEDuB90g/mxqJCe2MU7YNMFhdksR6W4flA=; b=SyV7K3HsmJnU3EOkt+Jpen4oFd9WSmSwwByosQNU1nk/nLRY+S+jUg/Gd5TpEoFYP5 akuYzuu7eQrl8EHjeRs3eGZzi3KDLJWmDOUYYPsxm1U5mlmMo8fpgYJqU85i6dFvB/Pc +kebbt8bG2ybkwyAMs6GGOqMztZiIIFQ73SIQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732182036; x=1732786836; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DQA02CvD4hEDuB90g/mxqJCe2MU7YNMFhdksR6W4flA=; b=Dkgz9jBWxZsRyYz/LHyIXxWg903TqAynIxes9R97MR2WvcphUz322PeyewfqOL5EGz OjpV6an6jjNPrF4EYuiBFFM8/O2h/2g2l7dw9G616eigqqYmbOFVSZEDLKR21jPzRrk5 AkcooIG5Cl21EIjDohLXV2Vb/mq9D3wvl++nlBySd2cPlGxOAwbtDdz2xVTAb3FNoxLD uyofxY8LGyzM3BGpGbR2s5/PE0L+Kq6kwVtSNDa6FRUUiBBoqErUcR+LiG21h3Vg8dSQ vp6QBzSewNdKq56lwfJeqhSJlJj7XqDHWgt6phpw19BkFy9oOnWnk/RVRvbtnLpgfops 8rhA== X-Forwarded-Encrypted: i=1; AJvYcCXDEf+LY6VXsXy7iAaOtLwYTglipgeG3SV8DNoYEWlGE8pUpfg/yXoc+ikyMNmBabfjk/l4GWNE0Ls=@vger.kernel.org X-Gm-Message-State: AOJu0YxvY8AzsnkjAV2vOniWbFTJNhBcim/4oDAQ/4SBrA7r3D9kDoce 9Xg77IOKQX+K5fti81uO4TEpFgcLXibl/IgveeMT6f5o4UiKQixG4hmTn9gj1A== X-Gm-Gg: ASbGncvRPJEFZfnkPJT0KNPmyzqLJxgW52D2cc+oXTgChCfCIq22WZhA5LnLmxv4+fm GJd7UNUyYC7Kk60ZGNSCn+u+ktwPtbsE60puPCcziwk/HWJ4YI1p0i3tFqpyzFoYUmRiHAYlB28 tpgxsx7f0Fb/k8AWD493jLx076VRUymtyLcmOVja5H/WkgQaSDs9/YKc9JjX1RHnsoCO2orUL/+ OjflzmVbJdTrOSYSs7QwyU1EDkxyg5bz21Ko8q5KZ5BsSCU8WZVVV8JDCQASVRKKQ6S X-Google-Smtp-Source: AGHT+IEyGvNhGFgKSNb4OSSuTfTsntxe5CklW9nyxQKa272M/cZBdFd6c0ELCErV9/RJhNPPjU1XuQ== X-Received: by 2002:a05:6a20:12c6:b0:1db:ed4d:fa90 with SMTP id adf61e73a8af0-1ddae3eb113mr8532716637.10.1732182036084; Thu, 21 Nov 2024 01:40:36 -0800 (PST) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:527f:df65:78d6:c140]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724bef8dafdsm3296596b3a.104.2024.11.21.01.40.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 01:40:35 -0800 (PST) From: Chen-Yu Tsai To: Bjorn Helgaas Cc: Chen-Yu Tsai , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Klara Modin , Manivannan Sadhasivam , =?utf-8?q?Krzyszt?= =?utf-8?q?of_Wilczy=C5=84ski?= , Bartosz Golaszewski , stable+noautosel@kernel.org Subject: [PATCH] PCI/pwrctl: Do not assume device node presence Date: Thu, 21 Nov 2024 17:40:19 +0800 Message-ID: <20241121094020.3679787-1-wenst@chromium.org> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 A PCI device normally does not have a device node, since the bus is fully enumerable. Assuming that a device node is presence is likely bad. The newly added pwrctl code assumes such and crashes with a NULL pointer dereference. Besides that, of_find_device_by_node(NULL) is likely going to return some random device. Reported-by: Klara Modin Closes: https://lore.kernel.org/linux-pci/a7b8f84d-efa6-490c-8594-84c1de9a7031@gmail.com/ Fixes: cc70852b0962 ("PCI/pwrctl: Ensure that pwrctl drivers are probed before PCI client drivers") Cc: Manivannan Sadhasivam Cc: Krzysztof Wilczyński Cc: Bjorn Helgaas Cc: Bartosz Golaszewski Cc: stable+noautosel@kernel.org # Depends on power supply check Signed-off-by: Chen-Yu Tsai Reviewed-by: Bartosz Golaszewski Tested-by: Klara Modin Reviewed-by: Manivannan Sadhasivam --- drivers/pci/bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 98910bc0fcc4..eca72e0c3b6c 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -405,7 +405,7 @@ void pci_bus_add_device(struct pci_dev *dev) * before PCI client drivers. */ pdev = of_find_device_by_node(dn); - if (pdev && of_pci_supply_present(dn)) { + if (dn && pdev && of_pci_supply_present(dn)) { if (!device_link_add(&dev->dev, &pdev->dev, DL_FLAG_AUTOREMOVE_CONSUMER)) pci_err(dev, "failed to add device link to power control device %s\n",