From nobody Tue Sep 29 07:42:02 2026 Received: from mail-pj2-f1.google.com (mail-pj2-f1.google.com [74.125.227.129]) (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 8323C1DED5B for ; Tue, 11 Aug 2026 03:10:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.129 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786417861; cv=none; b=kluWUvfB8mVWOpnZGAMy9ADmODV3cWw8CE+enUlWgy2xQZA7blSXhvO6oGWiP0bBp4NxzossYRRXIO5/MbV3ZiMxTj65J/MxmneIxCQCc+F+pCH2rpZ3izvKZ4IKn4vrjGhSZe415VyXL7LDzUvLs5tH+aiisJRbbd7NRnoSM74= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786417861; c=relaxed/simple; bh=9xGVGoG6+15SyTh2I5jQogP6u8bckxgfiAejG+A7hiM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WHEO9zLeqsfiLmmgCg3Klqx3NU6QmCxwiv5/WJTOwf1IZTYX290JdJFbuxa00jRE/bnZ/u9RaVvIiiKxJuzlTDzL2bkgbVMfIufietho7s10eg+3tO+1eRvQzCIvtCfObAEdBhmh2E+4eb2lYgeCqESVKHrDd1gAcaBKnF8ijuk= 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.129 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-f1.google.com with SMTP id 98e67ed59e1d1-3810f0aba07so1284179a91.1 for ; Mon, 10 Aug 2026 20:10:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786417859; x=1787022659; 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=5zOJ+OKoF01RgSFmlK3dcJuyfCzAbCRmdIbnifKtbW8=; b=end6+vev5aQ2AwvZAY0Q4d/VsdLTv0L8tZUkaWSvun3df6aJm4DDzH8BXkf1hWPsEV 2xDuhFiZzOY/WfryTU2DwWIekIg1Q+DiQJqYhZD+SmYczLapvbtaiY1gesTL5UBTo5Iq IdEV2ShAVrXF/1BfcqycfZgUsShigzW3XSDUikki0z0PiaxGOB0DITEMiG/joJoU9YRY ND3m2Hz8X08pMfpfsphAgNxxMXlo1+2jWT730qfzJs8Rx/Y8lUE3luHWlhhqOZldem6H 10uddC2rBEAJ+l3wHa+XxRKqdP/JztWHM63QABRIGRslqpq6JmOsun3oRXTykDh8Vv0p QE/A== X-Forwarded-Encrypted: i=1; AHgh+RpsPS93QoTVcyArFy2kIYMY90N7S83RBqOSpguzYK163BuO92qU5xLYGJXrQhkkTJvC8YCgb5ds7npR5aU=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9recKSvOjBJlFjcAn43AsZPfe2KXgi+mkKfwRq2AnU9kFKMTY 5HGbL1DqN+zJm+lYE/HUfyX+HL44fyFEhTaIhiTBfJ51sUqEkgygJ1Ij X-Gm-Gg: AR+sD11SLwtDRkilB2zww9KmOeaAaiCDevdGk/MUpA8SIwojv+HeMPKK66Y3h0dd5z+ Y/zrIuyI5Dh6HudK7QfYDiG763IkP4sqB+YDRzzIq4FsKFHkUEqp6FXiFTHYSIvZn5amYxXQXf/ 2HxQaH+wrXiEv+NE6WNtW/IdRQKgX8ZvBxLcmAY2phGTrEqPjvl1PGNLfg+F2X3Azg5f7hkT2c1 VGqS6d21m5y3y2hxu8fY6OWPa6w1+K5eFz7dKMiK45oCTl4+yzA9rdIO7GOfTiFgYEMy+HH0q2J ZPwNHqKQOP3bbSAz59E9ekwubGoysdftcpurqDydQMY66I3HAAbpo4ART1ubTWwJVToe1/n5mKR /8fwFMAroe+gMupS1digxEXjMFpcSgBhKVA4IYAY74D7OCs1AFFM3Rcz6JxhPyfp2b/acxNFIXI GRna0xYx6OnytKguGdvrPHWqjRiBw/omZZH1/wjBPPPIrmqlAzp2NglooxtYFTqELg5FHF5a0xh 3eplJld6t64jQdxse5U X-Received: by 2002:a17:90b:2dca:b0:381:a766:efc9 with SMTP id 98e67ed59e1d1-392ec34642fmr243891a91.7.1786417858834; Mon, 10 Aug 2026 20:10:58 -0700 (PDT) Received: from kylin-XiaoXinPro-16-AHP9.. ([116.128.244.171]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-392d51be07dsm1658527a91.6.2026.08.10.20.10.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2026 20:10:58 -0700 (PDT) From: Xueqin Luo To: heikki.krogerus@linux.intel.com, gregkh@linuxfoundation.org Cc: pooja.katiyar@intel.com, johan@kernel.org, pmenzel@molgen.mpg.de, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Xueqin Luo Subject: [PATCH] usb: typec: ucsi: Add ACPI_COMPANION() NULL check in ucsi_acpi_probe Date: Tue, 11 Aug 2026 11:10:47 +0800 Message-ID: <20260811031047.399164-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 ucsi_acpi_probe() to prevent NULL pointer dereference when driver_override matches a device without ACPI companion. Fixes: 1f3546ff3f0a ("usb: typec: ucsi: acpi: Check the _DEP dependencies") Signed-off-by: Xueqin Luo --- drivers/usb/typec/ucsi/ucsi_acpi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/uc= si_acpi.c index 18286d3e9cc5..b4a783217dc6 100644 --- a/drivers/usb/typec/ucsi/ucsi_acpi.c +++ b/drivers/usb/typec/ucsi/ucsi_acpi.c @@ -188,7 +188,7 @@ static void ucsi_acpi_notify(acpi_handle handle, u32 ev= ent, void *data) =20 static int ucsi_acpi_probe(struct platform_device *pdev) { - struct acpi_device *adev =3D ACPI_COMPANION(&pdev->dev); + struct acpi_device *adev; const struct ucsi_operations *ops =3D &ucsi_acpi_ops; const struct dmi_system_id *id; struct ucsi_acpi *ua; @@ -196,6 +196,10 @@ static int ucsi_acpi_probe(struct platform_device *pde= v) acpi_status status; int ret; =20 + adev =3D ACPI_COMPANION(&pdev->dev); + if (!adev) + return -ENODEV; + if (adev->dep_unmet) return -EPROBE_DEFER; =20 --=20 2.43.0