From nobody Sat Jun 13 16:20:54 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 5580347DD75 for ; Wed, 6 May 2026 14:25:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778077528; cv=none; b=px26p3iAPCGi+jDPP5Ik63FZunL+ciOrf9tX15ZGwVpUEAtnfy6/A96nPDTHJ2Fs2xvE0jKQfb2MxkT0A6yYOqa+9PxUyl2p/dDcWI9U+6PfpsYSxBhMJb6zu7NjvpohquvadEBUPFtGA7XkgLP0CiSdhYs/STeJVZkVtuSJO+I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778077528; c=relaxed/simple; bh=ypW9zan1ZQyE9puGZfL3DZyP3JwWjNKtGOLLk3bVaI4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=KcCYmK9c94YoklQopjLmoY15CMipE7bkzUubyYpFI7Z9oqc30+yM5gL0LttKQOmorMunVujHnGODhyA72Cl/Vy7m3NCRYXdrX7iXO/k3s7ICbvfxGB67a+uqXg+ctGwvItd8jUFe6CGGZNhxDRixHDPhTHpLU6jdfl1JTzAdItI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AHmhJ47c; arc=none smtp.client-ip=209.85.216.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AHmhJ47c" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-362bb3260f1so4972298a91.2 for ; Wed, 06 May 2026 07:25:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778077527; x=1778682327; 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=ZYpMO9UsirEzCSyLpg3GfIDUOtIlMUjHtSOkANbDsUc=; b=AHmhJ47cuT6Ha23gqYXzVKeRzCIA7xsGnq1HNSTgvnLDwDTUgvYazt/PjvF//I+KA3 rtCPU6FsDzRbzoiHhmh/+C4kLk6Tll3RE8cWjfSExlAGpJs2L+e+0XYJ1WwkJALHDAOR HCpA0RGm/8IyYVYNMi7c5XYDyWs6BBdlKpUf4PujbsMKsvltI+v2WnmFrmbHNgXLQHQe AVRQXXjURvUuP8gdBZnz2YvQRH1nSHrXvZzAR0a062FTr7Hsl8ZJzK57cy/ftL23Ev99 GaX/r46i+KTlqQv9XdtneORXTzgPSJ7sQkaEDae70heT4XniruUeH+pJa+dMUuVmmDs8 mmNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778077527; x=1778682327; 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; bh=ZYpMO9UsirEzCSyLpg3GfIDUOtIlMUjHtSOkANbDsUc=; b=ootWBefQK2WCYKiKwOK/DSSSblQu+xwfF/EdHV47oQ8DQH2XUkdMkOq1zSCB9uW2F6 KvCYhMON6ECrbD9xMJQrLk01CwbL8ZXIGdMFASgBGoutq//4AleGf3tR9JCYj6luflYm llR6euvyDTO0JiiO60ixghTUjpFgUKLKCAoa2wtCUvKKMb3TyICOGkfAxqPEm7eXzF7D jUkKJfz3ZdbuQ5O9wjrmDDBTYHZT/YoZKHHUhe32aUZEVRgqUkho5T6QaY/T24euQXCa c7vFc0F2VENSz5Gh2HDNaQSSo5gtWV2ggBtr0Znft6jmbgVhtNh6tm4gaf+jjAOR6CiB GA+g== X-Forwarded-Encrypted: i=1; AFNElJ/NvN7PFIeiESy6pIVxudeiU3E8aXC1u8p7XoEueReOzZKR+0HsLOQmylep95NK9uQn7PM93q3vRNvRzLA=@vger.kernel.org X-Gm-Message-State: AOJu0YxzFy5ZFjcI30MG4Dvo2Dwj9dNTsHPOrC98vjg9h6tcVo2I3kfZ MYDJbjasIIPSOvLC0xQgBNznPacZYEA5khfkxXlGZFUp6nGqg7s1wZAi X-Gm-Gg: AeBDieuRtpLQ/aDkFyHKxoUgnFnhC5uh2XQNz2Up4/yI07BAtIMagcaW+V6oaDaFhlM xApkbLS/hDk2hd0edyVEdgYu1W0wqZsdTpUpZwGzoLBz+XRBvNkwfArOk2q66XJm/RMGShd3+3o R92SpZNrLaiFIN4G9DSykLqRjgMUMcG7SNZNJyMPp6wgBzClCs6oSDFlxanh+N8FnJ/eYJ/4M4w GpWevtSC6Vm0JAkoeFYSddgT1sx51RXPZYXYziUqpikf2sXL4g89/h55DkUbWq0EWfg5KGoVgVK DXDkiAXDzCaqHulCcJGk7rxhaiaM1pdQKCW1eXfVATEz9+EcqiZ8JaoB1/Z/sfcItep5Kt6xgA2 /8QV6zu/bbgu3WXiEJOGal4XFb7YaNdy+rPccqlf5IXrxVR3Im363MqNeYWQ5SVDz+1Zujf3V3h LC1MqMfLhHKfiHmkVLSBKZfG5w X-Received: by 2002:a17:90b:4d90:b0:365:b93a:1ebc with SMTP id 98e67ed59e1d1-365b93a1fe0mr2522723a91.3.1778077526592; Wed, 06 May 2026 07:25:26 -0700 (PDT) Received: from lgs.. ([152.32.214.178]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-365b08fb3fdsm1118066a91.8.2026.05.06.07.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 07:25:26 -0700 (PDT) From: Guangshuo Li To: Liu Ying , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Luca Ceresoli , dri-devel@lists.freedesktop.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Guangshuo Li , stable@vger.kernel.org Subject: [PATCH v6] drm/bridge: imx8qxp-pxl2dpi: avoid ERR_PTR with device_node cleanup Date: Wed, 6 May 2026 22:24:34 +0800 Message-ID: <20260506142434.643523-1-lgs201920130244@gmail.com> 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" imx8qxp_pxl2dpi_get_available_ep_from_port() returns ERR_PTR() on errors. imx8qxp_pxl2dpi_find_next_bridge() stores its return value in a __free(device_node) variable before checking IS_ERR(). When the function returns on the error path, the cleanup action calls of_node_put() on the ERR_PTR() value. Do not let a device_node cleanup variable hold error pointers. Change imx8qxp_pxl2dpi_get_available_ep_from_port() to return an int and pass the endpoint node through an output argument. Initialize the output argument to NULL so callers using cleanup variables hold either NULL or a valid device_node pointer on error paths. Keep explicit of_node_put() usage in the helper and in imx8qxp_pxl2dpi_set_pixel_link_sel() so the fix avoids adding more cleanup action usage there. Fixes: ceea3f7806a10 ("drm/bridge: imx8qxp-pxl2dpi: simplify put of device_= node pointers") Cc: stable@vger.kernel.org Signed-off-by: Guangshuo Li Reviewed-by: Liu Ying --- v6: - Change imx8qxp_pxl2dpi_get_available_ep_from_port() to return int and pass the endpoint through an output argument. - Keep using __free(device_node) in imx8qxp_pxl2dpi_find_next_bridge(). - Keep ep initialized to NULL in imx8qxp_pxl2dpi_find_next_bridge() to satisfy the __free pointer initialization requirement. - Do not add cleanup action usage in imx8qxp_pxl2dpi_get_available_ep_from_port() or imx8qxp_pxl2dpi_set_pixel_link_sel(). v5: - Make the fix minimal for stable by avoiding __free(device_node) for the endpoint node in imx8qxp_pxl2dpi_find_next_bridge(). - Keep imx8qxp_pxl2dpi_get_available_ep_from_port() unchanged. - Do not change imx8qxp_pxl2dpi_set_pixel_link_sel(). - Drop Frank's Reviewed-by tag due to the implementation change. v4: - Drop the sentence mentioning the custom static analysis tool. - Add Frank's Reviewed-by tag. - No functional code changes. v3: - Do not change DEFINE_FREE(device_node, ...). - Fix the driver pattern by making imx8qxp_pxl2dpi_get_available_ep_from_port() return an int and pass the endpoint via an output argument. - Update both callers so __free(device_node) never holds ERR_PTR(). v2: - Fix DEFINE_FREE(device_node, ...) directly. drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 40 +++++++++++--------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c b/drivers/gpu/drm= /bridge/imx/imx8qxp-pxl2dpi.c index 441fd32dc91c..d64e328bf542 100644 --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c @@ -222,52 +222,58 @@ static const struct drm_bridge_funcs imx8qxp_pxl2dpi_= bridge_funcs =3D { imx8qxp_pxl2dpi_bridge_atomic_get_output_bus_fmts, }; =20 -static struct device_node * +static int imx8qxp_pxl2dpi_get_available_ep_from_port(struct imx8qxp_pxl2dpi *p2d, - u32 port_id) + u32 port_id, + struct device_node **ep) { - struct device_node *port, *ep; + struct device_node *port; + int ret =3D 0; int ep_cnt; =20 + *ep =3D NULL; + port =3D of_graph_get_port_by_id(p2d->dev->of_node, port_id); if (!port) { DRM_DEV_ERROR(p2d->dev, "failed to get port@%u\n", port_id); - return ERR_PTR(-ENODEV); + return -ENODEV; } =20 ep_cnt =3D of_get_available_child_count(port); if (ep_cnt =3D=3D 0) { DRM_DEV_ERROR(p2d->dev, "no available endpoints of port@%u\n", port_id); - ep =3D ERR_PTR(-ENODEV); + ret =3D -ENODEV; goto out; } else if (ep_cnt > 1) { DRM_DEV_ERROR(p2d->dev, "invalid available endpoints of port@%u\n", port_id); - ep =3D ERR_PTR(-EINVAL); + ret =3D -EINVAL; goto out; } =20 - ep =3D of_get_next_available_child(port, NULL); - if (!ep) { + *ep =3D of_get_next_available_child(port, NULL); + if (!*ep) { DRM_DEV_ERROR(p2d->dev, "failed to get available endpoint of port@%u\n", port_id); - ep =3D ERR_PTR(-ENODEV); + ret =3D -ENODEV; goto out; } out: of_node_put(port); - return ep; + return ret; } =20 static int imx8qxp_pxl2dpi_find_next_bridge(struct imx8qxp_pxl2dpi *p2d) { - struct device_node *ep __free(device_node) =3D - imx8qxp_pxl2dpi_get_available_ep_from_port(p2d, 1); - if (IS_ERR(ep)) - return PTR_ERR(ep); + struct device_node *ep __free(device_node) =3D NULL; + int ret; + + ret =3D imx8qxp_pxl2dpi_get_available_ep_from_port(p2d, 1, &ep); + if (ret) + return ret; =20 struct device_node *remote __free(device_node) =3D of_graph_get_remote_po= rt_parent(ep); if (!remote || !of_device_is_available(remote)) { @@ -291,9 +297,9 @@ static int imx8qxp_pxl2dpi_set_pixel_link_sel(struct im= x8qxp_pxl2dpi *p2d) struct of_endpoint endpoint; int ret; =20 - ep =3D imx8qxp_pxl2dpi_get_available_ep_from_port(p2d, 0); - if (IS_ERR(ep)) - return PTR_ERR(ep); + ret =3D imx8qxp_pxl2dpi_get_available_ep_from_port(p2d, 0, &ep); + if (ret) + return ret; =20 ret =3D of_graph_parse_endpoint(ep, &endpoint); if (ret) { --=20 2.43.0