From nobody Sun Jun 14 06:09:02 2026 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.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 C07BE326D4A for ; Sat, 2 May 2026 11:55:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777722958; cv=none; b=uc7NwPwMro3XBIIZ9KWQWxaDiiqAB9TbnCnVAFmYHRrheM2Yi/TXxsMZbpfvf4FMiJ3fkFO+6NFBO8Bg5nkSBRS8vkgTh6moOvsaLXyZ37lbooacAaBBe0Jvr88Tua4rMO0dGHHgDldIXnKy1/TckiLJkl5Y4e6RR0jgVuNRTX0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777722958; c=relaxed/simple; bh=ukA8Li2hr5tYPQA6gEHOkrrU1Q0/VLBNSU8rcMwrk4k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=jIw249dP6pnJw294t+0p+/A7rNhqyopPrE0jUenU3FmZVsGUdT59OQA4Q8h1R2cPOEX6WxBRZIrDDU4ZtdjwVVS3pyGgoE2S6msfvmacb/+v8SRcjR7NYIcRno41bSL77y8s1RTqi0mT43UFNBqtiRb7FGP85Lt6il0A39MGC5I= 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=oxIrZqMe; arc=none smtp.client-ip=209.85.210.170 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="oxIrZqMe" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-82f1bfc9b8fso1164720b3a.1 for ; Sat, 02 May 2026 04:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777722956; x=1778327756; 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=xG+dopoE7tyttQuw5xxPLAnkXqhbsfbklISoHSefbCs=; b=oxIrZqMetV0Fgovvw6u2z22RjZ879JLPZWx1fWDINZ2NX4YTp0pYCr4wDNJpl3q44X ANHUkXikK4OTBzkpQjYbqfU3V2ZxL4rQFh1IOsvZ00ic2s0TRfDoBDszQXLHjPzvJIaW o36Mb7UWOIzkdTdI8Mxzcdhvzf+3giTDfbG1lwfiOe9KdadvF07dzdgzHYsGDuibmJW2 0ACsfFFEOxcnp6deLXfGezb5Vq8yST1PqCk3E60C4Du/E3UT9eBwPqOUVHx+c77ESp4z 447l78sm/CiRH+f0V36N38zD6CijVZjqHJa56ooAQQURiCdj8ARhS34+l7ctUYeP/keb oA+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777722956; x=1778327756; 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=xG+dopoE7tyttQuw5xxPLAnkXqhbsfbklISoHSefbCs=; b=UBtstAWtb1yNYaC3KegoMAKWZydc1GbzGO/jeGvyMeFT4q7Mm+rwhgV668a1TXTv6i bxTn/S8+a/UhvBUtaZOfgrt0L8PeYxYsPX7OK+i05QKbuNH44b9BAFfU7RqkTy168FNT JsxDzXbSL5Wzb0qCIyvu7z7a3A07U1pi5IyaKRrYF6snM1qFXuv40JRc5zAOeoDKjM7s Ropf4nWyIIrNURrAGc5NB7/p1n6HnTPSR1QCFvKvGwn5mGWse1uq3GNY+pR9FUTcaWZI alnVh5S44S+pNp0xjbZk1aBn/WYzCewMUTYFw8/nADc+W2vgKudxLfzs4+g9KDTSwSTH vk2w== X-Forwarded-Encrypted: i=1; AFNElJ8p7rK5HLW+L6r9LGi0/WiQxXH7mddi3MOK4vfRD1tdVvZUDltBxzrPkZrKC0TvnWLlkBg0Hfq81rZGcZk=@vger.kernel.org X-Gm-Message-State: AOJu0YzD0srkI+zOAf1gjim8efwlV8jPj1mkexyP8pFe+IIlPJSUtbng W5tV0fCP3Wvjr5QB2iNg4SiSd6daS3lzXne6ZDxKfQ0ZF+GTJZa26+yc X-Gm-Gg: AeBDieuVWZrl4uTlpPAIEwYen2ngBKUTLF/CqCC14pRn5d/qEqBOFhiDusWYtmxZ6od wikjALC5RGNb26MhjOyDtkFRRxFIyZtGSXF3offfDJpDQTpui1PDfT3uzt5dBJAL8iRXzYMovfq EWIaGJmZWFlCbQLtR0cus+Ig33jFIBvxjDHVthIG9dVjo4Wr0f5P7uRuWjoAVpNRbkcnRjKtfka SKjiJ0L6gYGi7byp3Y2TNSH1o2z2Bzy2CtDtx1UGeNfYLzNdXrH8E4Fwrp3stfUocRy+XWLsfGT VaIUDpiSF14HCmkkPdT31W/akgcvzQXHMmZJKq67ewIiXCw2/xBdp3KZRZEjdWrDq4j4Pvu6eqS dObMeEIBAGLaCMTLEcqOfAcGmKyiQElfEVmvWY5xT4mXo0Lrn6HkypQ99uaPaDGlnbavbTjtpNf QQJPN04lvSkuj6QJiTcOuRdggN X-Received: by 2002:a05:6a00:2d10:b0:82f:96ab:e011 with SMTP id d2e1a72fcca58-8352d2f802emr2803655b3a.37.1777722955971; Sat, 02 May 2026 04:55:55 -0700 (PDT) Received: from lgs.. ([101.36.109.218]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83515b01a4asm5307663b3a.43.2026.05.02.04.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2026 04:55:55 -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 v3] drm/bridge: imx8qxp-pxl2dpi: avoid ERR_PTR with device_node cleanup Date: Sat, 2 May 2026 19:55:28 +0800 Message-ID: <20260502115528.530401-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. Return the error code from imx8qxp_pxl2dpi_get_available_ep_from_port() directly and pass the endpoint node through an output argument. This keeps the cleanup action operating only on NULL or a valid device_node, while preserving the existing error codes. This issue was found by a custom static analysis tool. Fixes: ceea3f7806a10 ("drm/bridge: imx8qxp-pxl2dpi: simplify put of device_= node pointers") Cc: stable@vger.kernel.org Signed-off-by: Guangshuo Li Reviewed-by: Frank Li --- 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 | 55 +++++++++----------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c b/drivers/gpu/drm= /bridge/imx/imx8qxp-pxl2dpi.c index 441fd32dc91c..a82f10218707 100644 --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c @@ -222,52 +222,52 @@ 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 __free(device_node) =3D + of_graph_get_port_by_id(p2d->dev->of_node, port_id); int ep_cnt; =20 - port =3D of_graph_get_port_by_id(p2d->dev->of_node, port_id); + *ep =3D NULL; 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); - goto out; + return -ENODEV; } else if (ep_cnt > 1) { DRM_DEV_ERROR(p2d->dev, "invalid available endpoints of port@%u\n", port_id); - ep =3D ERR_PTR(-EINVAL); - goto out; + return -EINVAL; } =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); - goto out; + return -ENODEV; } -out: - of_node_put(port); - return ep; + + return 0; } =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)) { @@ -287,26 +287,23 @@ static int imx8qxp_pxl2dpi_find_next_bridge(struct im= x8qxp_pxl2dpi *p2d) =20 static int imx8qxp_pxl2dpi_set_pixel_link_sel(struct imx8qxp_pxl2dpi *p2d) { - struct device_node *ep; + struct device_node *ep __free(device_node) =3D NULL; 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) { DRM_DEV_ERROR(p2d->dev, "failed to parse endpoint of port@0: %d\n", ret); - goto out; + return ret; } =20 p2d->pl_sel =3D endpoint.id; -out: - of_node_put(ep); - - return ret; + return 0; } =20 static int imx8qxp_pxl2dpi_parse_dt_companion(struct imx8qxp_pxl2dpi *p2d) --=20 2.43.0