From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 1830F44D035 for ; Wed, 6 May 2026 12:41:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778071292; cv=none; b=I8u4Zjemk66nWG2fMm6tygEuA7sVnVT7rWerZJHUnaGnJGEPVA+EB6j+xzOtAZBjRiddV+XaDdyQx95RFIYVwabWhxEBhikErVEDJO0eiHMVm3tRoVk8+iMbabrok+spbTNfPFofAIvaqr0Z6vmqW4DRl4AO397tGs7BLH/NyBw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778071292; c=relaxed/simple; bh=OinERmBbACIBYleiV1Zs0L/VJbZMb7jzEBvebOjGfjs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=VoTIqJ1ZLB8d+hEc59QJnFf6h0Y8KpEXMdYKIikPW8s9kQKTSGDtXOeepzItmLo+KY1EVjOlRyWatWdXzBnLbD2ytmclbexrDJSQ0WqTFIJpS9FJO2ZpInaUg6RZJbBRvMPTVP5DuENoZ+VgKNcow6DKof4AuCQkVxnjy9efm58= 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=Zeyiiv7N; arc=none smtp.client-ip=209.85.210.171 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="Zeyiiv7N" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-82735a41920so2330609b3a.2 for ; Wed, 06 May 2026 05:41:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778071290; x=1778676090; 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=0IlqU8VwEU2SI0FZdxgow47FUylG/UcOkwWktFbacV4=; b=Zeyiiv7NZKjdXGBQ/kCEqG66Qq9opnoRIOkkZWKS7tQXmZin7RSTUAfBIJqNleSZ9e nCuJf+R4600z5wn4L7b9u+4g2HptGg5rcnqA2yi3HibHcYJoirWcZRY7iQQ6JNdvVX6X IZyAt0zptWJSJ656G3c4aXNXo/PxxR70rMjrWmiWZn97kX4oKpavVVuTKAujmf2+vqA0 OwvPKpkOf7gCXHbFdd3UIB6cDvPvEXwpEw/75QVVi7CXMiMPtXU+YYM8uzM5+KQp7ydv Vf8ShErn0r1etUhKKvIMVYBqMJx2EdXD1vKRJew05GDjiB6DVrhLNI8RQTuQ9ukUg8SM MRNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778071290; x=1778676090; 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=0IlqU8VwEU2SI0FZdxgow47FUylG/UcOkwWktFbacV4=; b=XMp53D9/3cPZjOXsONINaBpaH9tyiQZtKQC0ldUwkXU86zKYuebUZ5qm+KJa6JHTGQ xIUKld/G8QBmk4HkWIpghd7t8gq1i2AFuEHqxqymNkBZiAv8I8YhjpyR4c1QmAFb//fR Imq/DaK5bKzQAZMePnKG46jdxTe8QF+/xzS2Q9SMDHX9SQBfJ0o0/ydYDMrF0CadqmEe 7tDL36GlyLDtBqUkONlgMDCQ+cnyh+tXYzqu75ol3LmtZkZjAZNiLpbk61pXZatgJh9X wQMbdq+FHTYOU6s+qA31a/D32/vFLFzs76DU7jBzjWDolOtDxRZR7LGmTg/nMqYe/yzY tJTQ== X-Forwarded-Encrypted: i=1; AFNElJ+D4Iy9gqMoKC25M53ZiqEkQkfyMM7yARxaPspJEmYHbBI/9yaPKP2Lb7FZqu1C9hPH8DoOer8=@vger.kernel.org X-Gm-Message-State: AOJu0YyryU2eTwQgTTN8r0OqBhhhdomeRUJa8IQ5vr5NksNR7JpebiiU Q4GUOTeCwHJyF1ZwNUNxMy+kAxLHYKddSI18+SXybmq5oa60Ns0AKvw= X-Gm-Gg: AeBDietGVau09472X2KxcSLY9WxpjbeaGjd7eP7WP4LpVzBhR0fLOr1HXQeEW0nW+xa 5yt5N184DycGRcOMmzFp88laDeOFWoiSDmTIx8R92LKEwKfOovRKap07wzPhrS7x0Fj+8YqkSRp 2+YyIhvHmt+T7xZCPMPHSbpZcpucHX/lLGSVP8umKp5y0OEVAA4zP2p0cSIMCR+3C8n8nXPqd2n xLvRxk94TQ3oui0prmdZ0CySeOdUKjU1aY9x4JLFks+BL3H/JQKNUVRPU63FuCOXnYxEP2pd4LE KbN4glXbB1gOpWJxaIu307hdfAqXoeOJKXP8DQfiQn+EfrbOWNZstoA+moMh269WeySDRX5pdFA H1hpEk21cAkMCS3SDk5gbOV0o3xqzjsmxAbmz++d+wTtX2WP9y2ab34vTWb7moCNHQNk82Db+G5 41KRAst87iM5ucI1CG5617XkIf5OLjEKgvra0EPaDFBu5KcCu7baCsTBAsXSjYq0x0sTHgxuBXv FYMiu3Mtw== X-Received: by 2002:a05:6a00:4193:b0:781:2291:1045 with SMTP id d2e1a72fcca58-83a5b2d34damr3232862b3a.8.1778071290350; Wed, 06 May 2026 05:41:30 -0700 (PDT) Received: from localhost.localdomain ([1.226.165.54]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-839679c7ba9sm5494056b3a.35.2026.05.06.05.41.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 05:41:29 -0700 (PDT) From: Myeonghun Pak To: Maxime Ripard , Paul Kocialkowski , Mauro Carvalho Chehab , Greg Kroah-Hartman , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland Cc: Myeonghun Pak , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Ijae Kim Subject: [PATCH v3] media: cedrus: clean up media device on probe failure Date: Wed, 6 May 2026 21:41:16 +0900 Message-ID: <20260506124124.27802-1-mhun512@gmail.com> X-Mailer: git-send-email 2.47.1 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit cedrus_probe() initializes the media device before registering the video device, the media controller, and the media device. If any of those later steps fails, probe returns without calling media_device_cleanup(), so the media device internals initialized by media_device_init() are left behind. Add a media-device cleanup label to the probe unwind path and route video registration failures through it as well. Fixes: 50e761516f2b8c ("media: platform: Add Cedrus VPU decoder driver") Cc: stable@vger.kernel.org Reviewed-by: Paul Kocialkowski Co-developed-by: Ijae Kim Signed-off-by: Ijae Kim Signed-off-by: Myeonghun Pak --- Changes in v3: - Rename the media cleanup label to err_media. - Add Paul's Reviewed-by tag. Changes in v2: - Drop the now-unused err_m2m label. drivers/staging/media/sunxi/cedrus/cedrus.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c index 6600245dff..7cb1f110d6 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c @@ -507,7 +507,7 @@ static int cedrus_probe(struct platform_device *pdev) ret = video_register_device(vfd, VFL_TYPE_VIDEO, 0); if (ret) { v4l2_err(&dev->v4l2_dev, "Failed to register video device\n"); - goto err_m2m; + goto err_media; } v4l2_info(&dev->v4l2_dev, @@ -533,7 +533,8 @@ static int cedrus_probe(struct platform_device *pdev) v4l2_m2m_unregister_media_controller(dev->m2m_dev); err_video: video_unregister_device(&dev->vfd); -err_m2m: +err_media: + media_device_cleanup(&dev->mdev); v4l2_m2m_release(dev->m2m_dev); err_v4l2: v4l2_device_unregister(&dev->v4l2_dev); -- 2.47.1