From patchwork Thu Apr 17 21:57:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dufresne X-Patchwork-Id: 882107 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.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 0002C21019E; Thu, 17 Apr 2025 21:58:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744927102; cv=none; b=BTdJ1aQS0CPy0/LLHG7d+UyOkZpx6l5JEg55wfhri/k+0h2JjKxUnFLBFEjYrhJivOUIn9YMz5eK8Iy1KPO9/EgugpMeL/3Q6iUCo6Q85mgZnneSJrlw9PrxwYCigRaMDVgLO0M6eUdZwKatfNaoDW1v17Ke+358O3FHzeXDQMQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744927102; c=relaxed/simple; bh=aeUagMt9j8V0x7zgrJ7xP0jWmkoNz11VjTWuvk0eDDc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Lp4hwcY6XKIQ8JyU4tRJsPvhiRd556rm0s9Gz3NnRpdn48ekji8vnd3iGg6qvCbCUZsp3Ymz4n+5TdGO97MI5uFmTRE4LtAS84X1MixfoC9iI11UlXT71jzvU+nXBIp6KTVn6GGsSDhIpUOXXSpNyreSzuP0IFo3IrQwPBhELyY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=lQ5y84gN; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="lQ5y84gN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1744927099; bh=aeUagMt9j8V0x7zgrJ7xP0jWmkoNz11VjTWuvk0eDDc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lQ5y84gNkIjCApuQBVyYGMqyLp00MyfTiczW2xFIpGO0U0+gfVFxVZzZAK63ukcsq si4v4PNwBuqiC7EhKvUMkq9QAXdgZ7Q8JblGgbmSc8PkVcCbTOnOOtesLJ+uVEY7ex 6kS+mPRWbDH+E2xTqsqSdc16Ms72Dy+FGkSsjxPbuMooGMGi8CLu36lIEYJGQ28oMg bl5cYSxFOOdLf/jEeZhKgcjPhLY+eG68DLxmcz7X+d4hgrpANL90rUUdSAkRV0Ypn6 u7xXSDOB65u3jR4jab6gKffn8HcsVI/V2CGum1XcEOBmHQDH5wIGAA2ABPMezcQyYd vz9qQbtoycf3Q== Received: from [192.168.13.3] (unknown [IPv6:2606:6d00:15:9913::c73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nicolas) by bali.collaboradmins.com (Postfix) with ESMTPSA id 44C1217E156D; Thu, 17 Apr 2025 23:58:18 +0200 (CEST) From: Nicolas Dufresne Date: Thu, 17 Apr 2025 17:57:59 -0400 Subject: [PATCH v9 2/4] media: rkvdec: Initialize the m2m context before the controls Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250417-b4-rkvdec_h264_high10_and_422_support-v9-2-0e8738ccb46b@collabora.com> References: <20250417-b4-rkvdec_h264_high10_and_422_support-v9-0-0e8738ccb46b@collabora.com> In-Reply-To: <20250417-b4-rkvdec_h264_high10_and_422_support-v9-0-0e8738ccb46b@collabora.com> To: Ezequiel Garcia , Mauro Carvalho Chehab , Greg Kroah-Hartman Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nicolas Dufresne X-Mailer: b4 0.14.2 Setting up the control handler calls into .s_ctrl ops. While validating the controls the ops may need to access some of the context state, which could lead to a crash if not properly initialized. Signed-off-by: Nicolas Dufresne --- drivers/staging/media/rkvdec/rkvdec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index 65c6f1d07a493e017ae941780b823d41314a49b8..7b780392bb6a63cc954655ef940e87146d2b852f 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -871,24 +871,24 @@ static int rkvdec_open(struct file *filp) rkvdec_reset_decoded_fmt(ctx); v4l2_fh_init(&ctx->fh, video_devdata(filp)); - ret = rkvdec_init_ctrls(ctx); - if (ret) - goto err_free_ctx; - ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(rkvdec->m2m_dev, ctx, rkvdec_queue_init); if (IS_ERR(ctx->fh.m2m_ctx)) { ret = PTR_ERR(ctx->fh.m2m_ctx); - goto err_cleanup_ctrls; + goto err_free_ctx; } + ret = rkvdec_init_ctrls(ctx); + if (ret) + goto err_cleanup_m2m_ctx; + filp->private_data = &ctx->fh; v4l2_fh_add(&ctx->fh); return 0; -err_cleanup_ctrls: - v4l2_ctrl_handler_free(&ctx->ctrl_hdl); +err_cleanup_m2m_ctx: + v4l2_m2m_ctx_release(ctx->fh.m2m_ctx); err_free_ctx: kfree(ctx);