Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 15A4644684F; Mon, 17 Aug 2026 15:09:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786979382; cv=none; b=RdlEobMDJy/xqj8MT3r+4T3MRYbQwS1BVtqtu8M6iU1el6MwzoPm43FYfNrhPh8fDQckW+NAt/AVxlf0hPTB1V6cZneinNsbM/4/TLwMrjYhrd0yJ8+gRcpzBbVWbjzyToUcFtGq1+WbJAQbNAZ7eJkogPD1ZAoG9Wcyr3XKWVw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786979382; c=relaxed/simple; bh=Sx10CAx7TLwMLDlyr13SXOM2SP4TW3y0JHEuCbUOqnw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j6Q4nhI1S90I/Ce2LXqYsTbyIVOl1b3dirVEsq23eeAWhjPC8uKiOHgJPlc8BkOx4RM3+dvEVrNLol+EVgCuvlIqdeHcmkmeZOu1i0t8a8ZwDECb7WyvS5vgGWPG5lM5lE6e0DghhOK27pSRS65X6r4khsEFM1P5hqwcVgoyKLQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LbQ7fftc; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LbQ7fftc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C41C1F000E9; Mon, 17 Aug 2026 15:09:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786979381; bh=gq38p4dztLs0j1IaIo9tdGH67Pztxx5fFuQDmk50Djc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LbQ7fftcZzMWMe97Y5kUtJSXknaWGPIA0qvabbk7+Zfn4F5FkD0jrveZXOjOkk3x6 60ypOZyJZUYEJnt4/l768mNTieaePGssny7YgtWa1D6UYwto1jplDo9WqghaUt7CH9 Rkb2PygrhgutLuCaAvLxM4wOYhLL/0oo9gPwh0SA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Valery Borovsky , Hans Verkuil Subject: [PATCH 6.1 207/609] media: sun4i-csi: Return queued buffers on start_streaming() failure Date: Mon, 17 Aug 2026 15:28:23 +0200 Message-ID: <20260817132551.025118501@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817132543.039278408@linuxfoundation.org> References: <20260817132543.039278408@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Valery Borovsky commit bbba3e260a62810a717b4442a3bb96d0ec0f6309 upstream. The vb2 framework hands buffers to the driver via buf_queue() before calling start_streaming(). If start_streaming() returns an error without first returning those buffers via vb2_buffer_done(), vb2_start_streaming() fires WARN_ON(owned_by_drv_count) and the queued buffers leak. sun4i_csi_start_streaming() returned -EINVAL when no matching CSI format could be found, before any setup (scratch buffer allocation, pipeline start) had been performed. The remaining error paths already converge on the err_clear_dma_queue label, which calls return_all_buffers(..., VB2_BUF_STATE_QUEUED) under csi->qlock. Jump to that label directly: the intermediate err_disable_device / err_disable_pipeline / err_free_scratch_buffer labels are skipped, which is correct because nothing they would undo has happened yet. This mirrors the uvcvideo fix in commit 4cf3b6fd54eb ("media: uvcvideo: Return queued buffers on start_streaming() failure"). Fixes: 577bbf23b758 ("media: sunxi: Add A10 CSI driver") Cc: stable@vger.kernel.org Signed-off-by: Valery Borovsky Signed-off-by: Hans Verkuil Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c @@ -234,8 +234,10 @@ static int sun4i_csi_start_streaming(str int ret; csi_fmt = sun4i_csi_find_format(&csi->fmt.pixelformat, NULL); - if (!csi_fmt) - return -EINVAL; + if (!csi_fmt) { + ret = -EINVAL; + goto err_clear_dma_queue; + } dev_dbg(csi->dev, "Starting capture\n");