From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 0AFFF23EA84 for ; Thu, 21 May 2026 07:35:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779348934; cv=none; b=qbx62uRyFpb7dd/+MBsX8EaYb/c7x4G2XdisISc3PchOXrJAGNUVyr5dVz2TbmyYUdVcSHv3kEzy5md4VR3PACrajW6u1lFtIwcyFWHZPU5yo//3cxFZVmwgaER6QRzlZVsxqnOOptN1aiCxSNQRhgPlgD6HF3MUVzANlYIH5Rs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779348934; c=relaxed/simple; bh=R3voIaLtl2BRlPPKHEPBQ78/UAuVNbWj0w+ZXJI+bb4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BtUmPlDj0xba8fToKe+0tWYKKnqV4Hdwu44ytDnx+iOkgijomCLwC3pF2FmZEF9QFD4qt5/asF5Lfyz//g4xTPOb3EtPH8DvDr5mebZ6skOJccKJm+EGGIyfL42vg14tMGZRCgLBWmoAnKrvo9Dy46jnhKlGOUJErojq7giFMdo= 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=HdhxFlHb; arc=none smtp.client-ip=209.85.216.45 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="HdhxFlHb" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-368f25ff4c4so3022103a91.2 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=vger.kernel.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=HdhxFlHb31qKSbw27ge6zqBrW4qTzLoC4CW/JbK43OvWrcjicwns75bxemt9fj+IgV GGvCY7l3A6EhurN+LbhTOAtMK7RaSlK6SsfaDLlHelN+suwbL31p8I9m6H2lOY8QqRe1 WWzefx+wcraTGqStv8XGslVhzVn7tm+yn3dIOZw4JkSrs0djgV8x3GgU42tQ/8Fh6+tk PS6BtHs44rp5K8YPbDSZXg9vgXmskDFp58+n8YqSo/Y8Zc2dVcNd5/CT+70aYvF78QGQ Axp05AWf5gP333QI8+3w7BCJS2E10u+SYavOSkQGoOC/K6hfMhkBqtOjBcjrbygtUED+ 66OA== 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=pOMHDjAhLQj43W6r+Sik0fH3zhir7YxKbYBZkFViE3qpwAIvJRnKADL3ajsSVg2mEx n8SErzxHEqr1KSVpJv9SxLCH+hqmgsyI1xgFVsCDJHta37bJmlWBzPhqHBVLd2niVsui mRR5D0cjKvCYYuWaDAoyDMPuMPlrnHQfFYa2MxlUX+S+XI0xaxK80EKDua6701C0V9QM Lt+SFX12J1AX+P0RMeUjKSaP+uONnXwmN/ZFe8Rv/4qALrR2kpmst+UjjiUf6feD49Om fltn+xShY/rTiP6PoeV/Bc9oSB75SDyEdLRUu/JbuBqZwQGQcEQ34/w9xoYewUvIUGkv WJlg== X-Forwarded-Encrypted: i=1; AFNElJ8qUjHgYu+IiMfPLAofPeTpoHgIseFvQoBbkVscAeEWKQI5l77or99lxelEucjfIAYKKniXRI+gi67sY84=@vger.kernel.org X-Gm-Message-State: AOJu0Yzv7qSPB2PUg6wrWTskHSswbxHrkmxoWdSr/jvSXFYGXRBIfrX0 eKZop/WEePTH4m/47F58M8dH0pPNbsMbtaZv/MrE+yuAyN3rvkwfwyGSj18m5A== X-Gm-Gg: Acq92OFfvcxkbZcWSySe+PLiDUjQvXaT7huiYsvh3Bk4T97kNiDWymbUuwm1e3qYlsq NNIikGkP3gxMZ70LP+5qb9/iyaQ4fT2MedXfDxBY2aXxDeY0TxrTN8X9gb8TOR02mtBTGvFgwdn pJ9t5J68BSLzmH1m+1cEc1ApF+2yvxtYZzym6IskHc84he+/YdRWRS3p0tgwQ2V/qCACv9zVFup yLubDKcWmnZVAdPVxNN4bkvhu6Gl3rxbtPxd6lLKlTiTdnQnb486KHguSiZrmNQ1wIXQDtkUalY JjGfBTLGDKFjy01tZLTOBx8fhqkd16vEu1f/7HcvZZSD2wJCXGy+UXtDtMNK8vCO2QY4BmkaPxq Ig4W1FVu18HNSdrN3azb09FTqBgK+oAA+FTDNdr+66ykA/jpEWUgipDC2Qk10m8xIowhRwTX9kL cpVBZ51F9SAwnX4KV85pXpw9OQ04hG3P4= 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) Cc: Anand Moon , Nicolas Dufresne , Sashiko 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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