From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 34D14CD4F3C for ; Thu, 21 May 2026 07:35:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kyIBYqPtDLkKrL0O4THyJVnL8cwoiEdoVvcy4jKYJlI=; b=wyXgGgd1cZks6f I/R6DEzbmkR9xfx6qRKUm4FbzZKY2pNThVZRZTFnGqn5VZ9IHfripgToB0Xf4TMfP1IOxc5Oy7wO+ YSJnPjcY1vYuJe77lKlZWCa2FnelWHb2JsnGxuN+CR5CL0UWJW9tvvEZAv4IBAW1Ybei/RkQQHcCG qV3mO6e0qii5Tek7Uv15GQ18b+SvkDeB/G7yXemJm+aOmkzPb0PKHmJyUDm1LjEdi2SYrs5kB47w5 LI+Eh1uBIriccd01kbKx1d+zVlNDU7B1Onf0MYkFYdRp+TxJpQMnWCfEr4jPtu9TQ6xgRnaBxVssH PAAH2dr3HyR7SEsXFTHQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wPxwO-00000006yfv-1k8v; Thu, 21 May 2026 07:35:36 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wPxwK-00000006yeO-4B0x for linux-amlogic@lists.infradead.org; Thu, 21 May 2026 07:35:34 +0000 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-36a3dd2e66eso410821a91.0 for ; Thu, 21 May 2026 00:35:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779348932; x=1779953732; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3NPvLu4dxOkoKdNg46+oSXq3CipWU7w/mHnMaydoddU=; b=BgX67+lsWX9y6QSM/Glnd9A48IA1AA10F44G0QkuLUzWKoX7iacX5pyT4eWGpUeUtI ohnaWprfFgZtSCekRdCc/rPSrlBMMDpnTUA/Pb80znAD2l77Q9/MDnTOhLL8CTSNH86k j13dnssXpo7uRKFxuKwolDp6xctvU8rBCucATZC3rmkKF8K4S6avllmd0ThUSlZzu0jG 5M1AJvjd9uTO2WodkmW7MOpcw8Jkr5S2t+SxYiCsSLI+hbVMm2fg8sRnn/PrIj0Uvv9Q ndAe8mCwvJkLYo5/bZfpthEliFAfH4/06BT95jtnycPVs2fyLrIf3EWvKT3BalYzObfX xlew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779348932; x=1779953732; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3NPvLu4dxOkoKdNg46+oSXq3CipWU7w/mHnMaydoddU=; b=b6WcOPf70lgA3gWsV3+Ui43mLJQxTqW7YBtEicTyooLZgF8DQIm6KdYPtFs18SDpsi F6aUFe2+Hwyw1MwkAHVfios+blY4qbH9IoLFZaZUxABjFUB7JE2x/OqxQb1oqQEIn+7x 5+pbgXKxJD1UtV1hsS3thHxO4BWn2JZX+zIyo1IDki1L1jtQ2nsq2QcH9cQNeyDEwQWK rF9QeEX+dT8Uf4hW64XxDifwgXAdKfiW45sApdCj/Lq/PmKNrIEUOcioJVstBFCGlzS2 3AHlCBDkHjs0eR/R33N6W8uIMtqeESopaNsLgnzJvuo21WXekDZiNXjLwx7M96ddai2Y pxQg== X-Forwarded-Encrypted: i=1; AFNElJ/l95ZLHrgVnPuj5UgSlQn17HEHuwWuWG2FjNEC8rL5NeuGDI6inWvcN6Zj+dI3hQpUi/zP8C6WZyT4iFKV@lists.infradead.org X-Gm-Message-State: AOJu0YwMUkplStn8DMDWPrXCgL5UUiOX49r+UG2qftckGiktprp3ljpG z6GUgz5DWYfW+ALhyrxWjeZ4Zpy4+z3FwyH/0bdzW0j+zbJGhODSV9iQ X-Gm-Gg: Acq92OE7e8h4RPAe01VCcu8FC49+KeheuLyaYJGymilbjGjhw8em90LS1CHbu/J3pWL aMY8agpnfvdtOt9X8roPp8pX7AyJyWCtpoSw/xAaEfUXPPFDQ6H9kBtAoOOlFQ3iebOmD5/pmlZ JfUw0zyfaCRiWwMpG/4urU0f/N4/JRKUJqUL8pEmXeVHLWSST9n8wE0Z4LTtnHHRR6i7nzvwgLj /j0ti5uTQLfim32iRLAGI6g0H4L8D5SoMoLdyC/tS5w+ua9wdiNyitq/7L0KdlHQyeqBSv6qKBc DQrAtJQZuEq5C1m41RiFqzVbR2mCisOUkFkiL2NYoEiv+Jve+CSJTQma8sic9SDkzGSePGNZn6b KB02gjeCZG5maRJNi+ltR0A5NGW7QqQmUS30rJVn456xsjh+q4RQTML/SKYwqkaJgf9sTmc7DWJ BmHaaSW8ZpgMnjedzduohe/pVafbGEHlk= X-Received: by 2002:a17:90b:3c08:b0:35d:a3b4:2f0d with SMTP id 98e67ed59e1d1-36a45137990mr1777189a91.6.1779348932255; Thu, 21 May 2026 00:35:32 -0700 (PDT) Received: from rockpi-5b ([45.112.0.230]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36a45c5decesm783833a91.1.2026.05.21.00.35.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 00:35:31 -0700 (PDT) From: Anand Moon To: Neil Armstrong , Mauro Carvalho Chehab , Greg Kroah-Hartman , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Hans Verkuil , Maxime Jourdan , linux-media@vger.kernel.org (open list:MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS), linux-amlogic@lists.infradead.org (open list:MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS), linux-staging@lists.linux.dev (open list:STAGING SUBSYSTEM), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 2/3] media: meson: vdec: Add error handling for recycle thread creation Date: Thu, 21 May 2026 13:04:12 +0530 Message-ID: <20260521073449.10057-3-linux.amoon@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260521073449.10057-1-linux.amoon@gmail.com> References: <20260521073449.10057-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260521_003533_037660_1BBE97F2 X-CRM114-Status: GOOD ( 16.66 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sashiko , Nicolas Dufresne Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org Add proper error handling for kthread_run() in vdec_start_streaming(). If thread creation fails and returns an ERR_PTR, record the error, reset sess->recycle_thread to NULL, and unwind resources via err_cleanup. This prevents later calls to kthread_stop() in vdec_stop_streaming() from dereferencing an ERR_PTR and causing a kernel panic. Fix this by adding the label and invoking vdec_poweroff() to prevent hardware power leaks. Additionally, reorder the error path to properly mirror the allocation sequence clear the streamon status flags before emptying the M2M buffers to avoid race conditions, and ensure DMA buffers are released gracefully relative to the hardware state lifecycle. Cc: Nicolas Dufresne Reported-by: Sashiko Closes: https://lore.kernel.org/all/20260520045905.6ACBA1F000E9@smtp.kernel.org/#t Fixes: 3e7f51bd9607 ("media: meson: add v4l2 m2m video decoder driver") Signed-off-by: Anand Moon --- v4: new patch [Severity: High] This isn't a bug introduced by this patch, but does the driver verify if kthread_run() returns an ERR_PTR when starting the recycle thread? If thread creation fails in vdec_start_streaming() and returns an ERR_PTR, could a later call to kthread_stop(sess->recycle_thread) in vdec_stop_streaming() attempt to dereference that ERR_PTR and cause a kernel panic? --- drivers/staging/media/meson/vdec/vdec.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c index 9244fb09eb36..8615a935e86d 100644 --- a/drivers/staging/media/meson/vdec/vdec.c +++ b/drivers/staging/media/meson/vdec/vdec.c @@ -337,29 +337,37 @@ static int vdec_start_streaming(struct vb2_queue *q, unsigned int count) sess->sequence_cap = 0; sess->sequence_out = 0; - if (vdec_codec_needs_recycle(sess)) + if (vdec_codec_needs_recycle(sess)) { sess->recycle_thread = kthread_run(vdec_recycle_thread, sess, "vdec_recycle"); + if (IS_ERR(sess->recycle_thread)) { + ret = PTR_ERR(sess->recycle_thread); + sess->recycle_thread = NULL; + goto err_cleanup; + } + } sess->status = STATUS_INIT; core->cur_sess = sess; schedule_work(&sess->esparser_queue_work); return 0; +err_cleanup: + vdec_poweroff(sess); vififo_free: dma_free_coherent(sess->core->dev, sess->vififo_size, sess->vififo_vaddr, sess->vififo_paddr); bufs_done: - while ((buf = v4l2_m2m_src_buf_remove(sess->m2m_ctx))) - v4l2_m2m_buf_done(buf, VB2_BUF_STATE_QUEUED); - while ((buf = v4l2_m2m_dst_buf_remove(sess->m2m_ctx))) - v4l2_m2m_buf_done(buf, VB2_BUF_STATE_QUEUED); - if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) sess->streamon_out = 0; else sess->streamon_cap = 0; + while ((buf = v4l2_m2m_src_buf_remove(sess->m2m_ctx))) + v4l2_m2m_buf_done(buf, VB2_BUF_STATE_QUEUED); + while ((buf = v4l2_m2m_dst_buf_remove(sess->m2m_ctx))) + v4l2_m2m_buf_done(buf, VB2_BUF_STATE_QUEUED); + return ret; } -- 2.50.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic