From nobody Sun Dec 14 14:10:42 2025 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C8001D63FD for ; Thu, 16 Jan 2025 17:50:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737049832; cv=none; b=rortBOmZWzFrpU0YSV6QJ6LhZLmhnArndR7lhrC1bIQ3raHkscTgNmlRFzNRYI543HIKM9KCTPQgDzaIUfQgcf8287ZD1cj3FDmnVkyJtqgOOUTF0wiajBOiIqhIW1fggtMHj3tv2TIV7gWEEztuPmoCscDUYmJzha5/075vKl0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737049832; c=relaxed/simple; bh=M4w0O+NYTB5dgGY2gUWrNLUjYQzNpf3MFvPeyIQjrxs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gyYMd1D5j5eFcj97qO+XWYG8NlkeorvLRzmK7T4LnHLWcdoGG8xLk1dFkcp2ZwNEw61BgFd9Zzl+nhJ/+QYGFtW1RgpLHXIBENNmg+Yj2uiGmT30OE2VCDxMYK8gzjV7jusP7SLJ5BAya8k/Q+GFUCHp8OhJSe5PQC56SElyPcs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=i4jbaIrt; arc=none smtp.client-ip=217.70.183.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="i4jbaIrt" Received: by mail.gandi.net (Postfix) with ESMTPSA id D548D6000B; Thu, 16 Jan 2025 17:50:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1737049828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kU8aEs77fF9qgIAmqQ6svDQpn6KLGmRQxF31gvkx7D0=; b=i4jbaIrtLSD/fkvoDAR9HMxbycJIeoAH0gT49Tg8DaWWO1XkyI3NS7Fi297gu9WbSvxv89 69C1qqwTPDZ6wHoJD0u3Hnp75wGvwKSV6ylOg7A5/RpEmYoJ0cvaREo+uhnWe+3Wc5J7G0 tno02Wiadtx00Xf4gddECV8tImK48O5sDb7ypw9iBaPsPszWw3hNuMe7C9EAiBvngPNbL6 lR38s6HJcinP1KJODLpb8cZMwk/aJK4H/j5Y1XjKX8kdWNZaFbcnFN95/sByCTPv4jBEEn XVS9s7rSQ2M3VGAptEE8c0W2gTLXNC5XBESFQEhZwdySzEKvvGpyR9DrcTS2LQ== From: Louis Chauvet Date: Thu, 16 Jan 2025 18:47:18 +0100 Subject: [PATCH v9 6/8] drm: writeback: Add missing cleanup in case of initialization failure Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250116-google-vkms-managed-v9-6-3e4ae1bd05a0@bootlin.com> References: <20250116-google-vkms-managed-v9-0-3e4ae1bd05a0@bootlin.com> In-Reply-To: <20250116-google-vkms-managed-v9-0-3e4ae1bd05a0@bootlin.com> To: Rodrigo Siqueira , Melissa Wen , =?utf-8?q?Ma=C3=ADra_Canal?= , Haneen Mohammed , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Simona Vetter Cc: dri-devel@lists.freedesktop.org, arthurgrillo@riseup.net, linux-kernel@vger.kernel.org, jeremie.dautheribes@bootlin.com, miquel.raynal@bootlin.com, thomas.petazzoni@bootlin.com, seanpaul@google.com, nicolejadeyee@google.com, Louis Chauvet X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=2553; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=M4w0O+NYTB5dgGY2gUWrNLUjYQzNpf3MFvPeyIQjrxs=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBniUbbiyn+IwPfYy8oaogNIn/JdhWXeF157mTID wgP7TWE35aJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZ4lG2wAKCRAgrS7GWxAs 4sBTD/9fs2GzjcLpO3dOikiL+p8iC6bFhVDltpLhD+/LdDJ464jjS2CtBTgPn+KXxSx1Vb1ufee z15XuwIJT7Saqp+MQT1RFMz/aByDGOgcEzGo+aa+ZNc+DzaC8I+JU050bVhezAUbbh9QPsNsABU h1B669GcRtIW7GGetLVLnj+qPT/vZmQddJFfKJQIDyuqTo1lIGzCjcVkhDXAZM2iqutsEbKQjLF x8XQ8NNLPgbB+VevvVUNpKkV3EZ5yzGujIe4AYeLZce/2kQlCBSMLeBIW8MxXwM4IHu8yJaDZ5s mZ0ZB4vAChz9uNz5E+aRrq57bk+Ix3TGYsExLaZoiI5DgDMZuJvg59IkkUyDzVS6nSfUvH6ohNq 46ldTVlfCQdBLgtEwCOtNI7XrbIZk1wAuy9BCF45Nk3t/k5myVnURVnKj9vT/FoKpBsepucURla XAF6/nDPoqInr+qTIJnlmtzsDnEckeG/VtwW7q+jZt6hthBzKjaJtTTCFmyuaa+nFPf5j/JyVbV /zewCThYGgiJJdyS3ayj+Zo1jcZmprRQ1B1DqffU96+LRNBDYGCsIJ6Bx7rsrq6Hk9D1qH35z8+ D9erNJvoJh+b2x1NkP04pb2fbkgSB4fulakNvAj0fl9lsU7qHJqQiGbeyBNAEQS/I6U/947QLuJ 5430w19o5lf9Nog== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com The current implementation of drm_writeback_connector initialization does not properly clean up all resources in case of failure (allocated properties and possible_encoders). Add this cleaning in case of failure. Acked-by: Thomas Zimmermann Signed-off-by: Louis Chauvet --- drivers/gpu/drm/drm_writeback.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writebac= k.c index 057af96dafeb879534a695167ad16e8a4e9a1bce..4cdc6cdcf76beb33f169a46f589= 5f0d681b11453 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -196,6 +196,22 @@ int drm_writeback_connector_init(struct drm_device *de= v, } EXPORT_SYMBOL(drm_writeback_connector_init); =20 +static void delete_writeback_properties(struct drm_device *dev) +{ + if (dev->mode_config.writeback_pixel_formats_property) { + drm_property_destroy(dev, dev->mode_config.writeback_pixel_formats_prope= rty); + dev->mode_config.writeback_pixel_formats_property =3D NULL; + } + if (dev->mode_config.writeback_out_fence_ptr_property) { + drm_property_destroy(dev, dev->mode_config.writeback_out_fence_ptr_prope= rty); + dev->mode_config.writeback_out_fence_ptr_property =3D NULL; + } + if (dev->mode_config.writeback_fb_id_property) { + drm_property_destroy(dev, dev->mode_config.writeback_fb_id_property); + dev->mode_config.writeback_fb_id_property =3D NULL; + } +} + /** * drm_writeback_connector_init_with_encoder - Initialize a writeback conn= ector with * a custom encoder @@ -231,18 +247,20 @@ static int __drm_writeback_connector_init(struct drm_= device *dev, int ret =3D create_writeback_properties(dev); =20 if (ret !=3D 0) - return ret; + goto failed_properties; =20 connector->interlace_allowed =3D 0; =20 ret =3D drm_connector_attach_encoder(connector, enc); if (ret) - return ret; + goto failed_properties; =20 blob =3D drm_property_create_blob(dev, n_formats * sizeof(*formats), formats); - if (IS_ERR(blob)) - return PTR_ERR(blob); + if (IS_ERR(blob)) { + ret =3D PTR_ERR(blob); + goto failed_properties; + } =20 INIT_LIST_HEAD(&wb_connector->job_queue); spin_lock_init(&wb_connector->job_lock); @@ -265,6 +283,9 @@ static int __drm_writeback_connector_init(struct drm_de= vice *dev, wb_connector->pixel_formats_blob_ptr =3D blob; =20 return 0; +failed_properties: + delete_writeback_properties(dev); + return ret; } =20 /** --=20 2.47.1