From nobody Tue Sep 29 07:00:18 2026 Received: from mail-pj2-f8.google.com (mail-pj2-f8.google.com [74.125.227.136]) (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 12B174307AF for ; Tue, 11 Aug 2026 10:21:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.136 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786443723; cv=none; b=b1BygsXhMjoXLaj/+3nwrn6K/Zaur647n8NIs6pE32ux9bK+GO7MFwICG8dXtNUFa9JFgVUOM/GzKpryIUTqGL9wFUSVLbOaXIjicdTE1ld8qTeqSyHyIBb6okuctq4WDQ6FtO412R6Qx64XhMNQutfTlACDacZH4wHRspOqRak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786443723; c=relaxed/simple; bh=3w7qdREcKF013xDNyNPF3fGwxZf1uoEpkhlXnxCwLgY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=lgKVsZ2OOFH2gNdOXMElMFTJqevzA5kicCwBZlGZEA7XW7kgjkPAWkhK48Z5PLLxXIv+90BsErvok70XObf5DTqhMfI5NGyHCN3OQjfQlXR1KUT6qjd3LD68Z+wzYiTqeRupbqn7iDvrDuHezDPl+Vwu6gjag6Tn1mbY+oJtmDI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=74.125.227.136 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pj2-f8.google.com with SMTP id d9443c01a7336-2d313798bf8so3450115ad.0 for ; Tue, 11 Aug 2026 03:21:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786443719; x=1787048519; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=jTYjZBZGMPVvD7fTKHpg8PYeoZCfwS/aHmI9q8GSv60=; b=pxAINeWWMQGpq83LlZ+qO3bKhenJB6RSceuqwE+oU1QHN3203ZJnaeOVITH9DS2lQS hY7vm9jLQMqicbU862I2thECrdSkDOi6CzigA3DjVXU80HA3tPJkuPnsBMSxaoxv52st kLxK0As5vSc02tCLnQnoIvV0yl2+BBfVMFtanBYfgC0thw40i0TOwTeQzBccjME6DokG 3xrY8FwJbTQy3bMBZjEi4Yb72QvmpK91NcVDASnN6g00vw4Z44Hm+1m0hJJ0t/DdzciR 1g4SZTf/kg9Yo3yZ1TGJA2KQ68psPrZ9s4Q8nH/M0DIQipSaxxIpBzVTXzKWWffeSUVv GLqA== X-Forwarded-Encrypted: i=1; AHgh+RoaQeReFxMpuP25ct2xP1pW8zkDhN0pt5/mOZ+uuKwk/SnEJUFHp8DXjeYJ2Dga3UJ6MEiA2qHVlYwaI3I=@vger.kernel.org X-Gm-Message-State: AOJu0YywPKldzyvL5MhzIn16XTvA/CxvCx0RDCppYbSerYzUpSHz5sDy 3C8hyhcF0ebTDpKYlLl1SB0WcSP1wSiNHoK17B9XvoZRvFzH6FBjTZhx X-Gm-Gg: AR+sD13rsSVSXqgrpTMApX0mxTPOBvqNp1KfyX+q3vQRKSp25r5AvuVv5+Ip7V6Lou1 Scv6e2izr/lvKM1Z7oKj11iGZAnVzLUBgSBHt8x+82Kl7cSHzrEL0IJJtYt0ix/2EiuFJkMp9sv amQOZP3ourfcLDoIOUuzf6PbMWfTX84VGr7cbyY4LTTDQvMXyzezQlW/XKu5uMmhC+/3Z4UDmhn 0Warf05FC3i+mdGozAtwAHfbfZQ1Pvr4mV9VbXYr4nC4Mtoxqm3RdgeTZj5nulHIRuAAGFxW/nt t9uAaVr35rgAm6xY7n0K2oZULp0Mc2FGbYiggaIHwk4coYl9XYPuV+wIsA09mLjdq7H6WQiZHip ielpd/ddWAbIvz8kwnAiLatCCq0VxMlV7bbTrnxrb51QYCr0CJ7geZJQzcN0ru6jOYFzv6iWkpH wWcr5lTRqrr7OpjluJiCUqh7/cnUkEACMfEt53iERkoOirdl3QZI0ollaxb2NTsG/brbwG0iCAy T7lEiEBwQ== X-Received: by 2002:a17:902:d488:b0:2d1:1a18:4d0a with SMTP id d9443c01a7336-2d3177a2163mr23058195ad.9.1786443718684; Tue, 11 Aug 2026 03:21:58 -0700 (PDT) Received: from kylin-XiaoXinPro-16-AHP9.. ([116.128.244.171]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d315ef0a79sm5221975ad.9.2026.08.11.03.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2026 03:21:58 -0700 (PDT) From: Xueqin Luo To: W_Armin@gmx.de Cc: ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Xueqin Luo , stable@vger.kernel.org Subject: [PATCH] platform/x86: wmi: Add ACPI_COMPANION() NULL check in parse_wdg Date: Tue, 11 Aug 2026 18:21:28 +0800 Message-ID: <20260811102128.1027805-1-luoxueqin@kylinos.cn> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add NULL check for ACPI_COMPANION() in parse_wdg() to prevent NULL pointer dereference when driver_override matches a device without ACPI companion. Same issue as CVE-2026-64227. Fixes: 4186a47dbfbc ("platform/x86: wmi: Decouple probe deferring from wmi_= block_list") Signed-off-by: Xueqin Luo Cc: stable@vger.kernel.org --- drivers/platform/wmi/core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/platform/wmi/core.c b/drivers/platform/wmi/core.c index 529825dcfbfe..151b712d08b5 100644 --- a/drivers/platform/wmi/core.c +++ b/drivers/platform/wmi/core.c @@ -1290,7 +1290,7 @@ static int wmi_add_device(struct platform_device *pde= v, struct wmi_device *wdev) */ static int parse_wdg(struct device *wmi_bus_dev, struct platform_device *p= dev) { - struct acpi_device *device =3D ACPI_COMPANION(&pdev->dev); + struct acpi_device *device; struct acpi_buffer out =3D {ACPI_ALLOCATE_BUFFER, NULL}; const struct guid_block *gblock; bool event_data_available; @@ -1300,6 +1300,10 @@ static int parse_wdg(struct device *wmi_bus_dev, str= uct platform_device *pdev) u32 i, total; int retval; =20 + device =3D ACPI_COMPANION(&pdev->dev); + if (!device) + return -ENODEV; + status =3D acpi_evaluate_object(device->handle, "_WDG", NULL, &out); if (ACPI_FAILURE(status)) return -ENXIO; --=20 2.43.0