From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 A027846AF2A for ; Mon, 11 May 2026 17:12:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519551; cv=none; b=ggx8FRDNp1qXBI7uEmHHkwox+LkNBfFxo4ep9n5aJlMLYeEGpBDL9X44bJdfXCTwaMprDyevze79P309L9hiZsl7Z6BtqvBTVngVnXiXSH+v0btE7EHIhQszTzUtS82GWyEjFqtDTzBHE4wyaqPq65Y3D8WLDZ3h8C+DEiezu8Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519551; c=relaxed/simple; bh=Gt3yIVFcMfYZ48mYTPU++4MAqYZaXfW/cae5IEUlc88=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qlcUP1mEE8L7W4nIa3hpXxF4jmy0hgcUlEOQkK8o4ucU5pTyrI2EC6cPXh2dq3JOQKXw8CiF3XjfglhFp45Syl3FIo3fOzTWtWZVh/M+iTTqe0x0w2YQO23U/hrQTtre3yXEsa+rtOIrz8H3Fg6AFsIRKqq4PK1R/D1Dg6o4Vik= 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=S1B3cRTm; arc=none smtp.client-ip=209.85.167.53 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="S1B3cRTm" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5a8c94cefcdso1137503e87.0 for ; Mon, 11 May 2026 10:12:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778519547; x=1779124347; 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=7HLgvNKbFd9dvErpzRIPe7Oy/Q20OX1O2SmZxWVb8gM=; b=S1B3cRTmdSG7WhR78gz+ZcCvPVN3Qqd1GOUiUd1N7KWGflFn2rOwh9TzFmt0FrfwY/ z0rHWIeH0CALbtGzZHAoX9BnoEnrUzhh5X/9QCTz2+0a5PBPnTVtXY3ia6gpdkUSiMsy 9HY/mbKKLOYOQnVuLinJ8mhZZulo54IWIpsic1j0rLvDe4dSo5/M432pvzDo5YMCPBEk mER9FQ5Zvn+gr8reKT6HsYS0Mo5VZZLw0oS6FVz57kvzFg8NaKL+a5G3z3jKc1wPET6K phcXLI4idnuWe+4lD9yqf1/UUaOZ77BG+SP53JrC38qsAxTDgd5uS/wRboaCrNNf0kZZ lSFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778519547; x=1779124347; 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=7HLgvNKbFd9dvErpzRIPe7Oy/Q20OX1O2SmZxWVb8gM=; b=GrqiMaJC2oKIW8Ro+27bosvIFmyNspz8VUD8AeUk1U3K5s6ilJm/XAsA5c8JvYsTWk rsBGgPqhfss48aH7HiGQe+PMQEm5L17YCcNED3IYiP/BAsV1Pjmy3rcOYLC9Z/ayav8Y evkQVPVzRJi1pS/FCKLHCKb/hQ1E+SPF8bvDCAcI5eXl2BCFHb1U6wgGcP1MC2N/3x+h ZxSBjEPtZxPF6HVlwVsYVc6N17xCIByNICCVfZ3lb7+9cRNB7TlCi58sJ1gJNwauq96G emmQ9/LUxo3I7t5q2Lc/2tHu9ieQhFx0oVQwhIWCAhZSrfUeAup196nQWJtp6Q/fjo7N k8Cg== X-Forwarded-Encrypted: i=1; AFNElJ/N5Cx2R1ohD7hBZ2cKr+Gq6AOSauc1fXTTrODR3p9yoOX2TU+SdTkgrd55x0Ew+Ems+guKDpvTSx835Lk=@vger.kernel.org X-Gm-Message-State: AOJu0Yz98EzRPhKhft23qDu76dpZzB35yGd/9mf2rRkkjaLlDMmkbqSG zO0R/oNdDhrmDnQ+GHirhLxJ1VMa17YdXYP357/Alk2emzB7lTQQGsAJ X-Gm-Gg: Acq92OFS26VGcjhc86TunM+WmTmiD5Smsdh/oLkLbksbbyDDvC8IxTcQoW4Y5heVOTn rPqPkv6+HYqPT0FnAvrrokln6Lnv68RjtEXnpxolE03xi4XNf8kY8dFoQoKlVaLFIbbtdACWYi0 /1ls66GbZwqpe7sqmxPkOvTmFejXTCJ1IuyCXAKA1tfKs3f0MNroYXB16P6zJsjREUtBOv2zEQ+ gBbUfM/NKZFp/pyrx1N1mrR+QF3gw16GT+Ou+Y+AmeQHksEBeV+Fk7nzOC6IqCQr33pJPZ0NFN3 DXpnzNPE70P13L9E7yBOaVzKKU3sxTxJPsefXtSqOCscY/7B7freg15DbbqFCTTAsxNcxfQnx1F Fd7rw5Umk/GhZi8XgMyMPsPVNQYycuHvBxeDsNzcULSIHDljy/1S89atIeuAjjTdnN+CCjAOHx6 oxmF0zMMHpQ+B/uEdKqYesf9mvWPvlUH3QRFV7Nk6vIQWuS6Vbkz+AEzmJVutD X-Received: by 2002:a05:6512:3d8a:b0:5a8:a558:63b3 with SMTP id 2adb3069b0e04-5a8b709b088mr3026360e87.30.1778519546521; Mon, 11 May 2026 10:12:26 -0700 (PDT) Received: from va-HP-Pavilion-Desktop-595-p0xxx.mshome.net ([193.0.150.248]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a8a95660b6sm2765488e87.62.2026.05.11.10.12.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 10:12:26 -0700 (PDT) From: Valery Borovsky To: linux-media@vger.kernel.org Cc: mchehab@kernel.org, hverkuil@kernel.org, hansg@kernel.org, hugues.fruchet@foss.st.com, alain.volmat@foss.st.com, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, sakari.ailus@linux.intel.com, mripard@kernel.org, wens@kernel.org, jernej.skrabec@gmail.com, samuel@sholland.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Valery Borovsky , stable@vger.kernel.org Subject: [PATCH 6/6] media: sun4i-csi: Return queued buffers on start_streaming() failure Date: Mon, 11 May 2026 20:12:11 +0300 Message-ID: X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c index e911c7f7acc5..4781db21c205 100644 --- 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(struct vb2_queue *vq, unsigned int count) 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"); -- 2.51.0