From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (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 E921043E9C8 for ; Mon, 11 May 2026 17:12:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519537; cv=none; b=FIBjUvCh5ZK9MOmqSPBXMegdbetqO8/cfDk8BsyHBFxUMyTw4wecNOOsh/kzTBplnGpSR+27c08P5v66h8FQY0MB3IUcrwoZh/TPYZN1Jo9De9+u9TK3oUo3ZLYOje62zr8ntYtm1kaJ2F4nrjyfATGHLm9wHarAU7KgqGj0xPM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519537; c=relaxed/simple; bh=3LLaazElOMKyi+EA4lRpSGDokD+YpjiONdAqGB1Oq10=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=dwlLcGfzNsBS+yKxkUywW6jfHTQ5t310rj28kkdt9ucsQMM7QtF2qyKAwl6YnsHTG/IizvPUYhkFAVD1bQWuriK9uN1cbrXu1iAh0ZxN/jKWFrhlUkttOdyPV7HVkczZLUVs3OpfpZBIq+jYbNcxFgr5d+dGiPcmds8fyhOCaaY= 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=hknY5BJ6; arc=none smtp.client-ip=209.85.167.51 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="hknY5BJ6" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-5a8891f0c88so2673705e87.1 for ; Mon, 11 May 2026 10:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778519534; x=1779124334; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1Ffx9yq19kp+YfhQJua5Fc4ABV19E4122HD3QSi0Mg4=; b=hknY5BJ69gnOQP+dVrFcKWlluF5XxgPXR3dOHEkrH2kvxuVE/mgaigBPJkxF9oOBpI yewrRnP4S0RFs4EuUnK8aldzI2ZfKlnVgqGg0/VXgfLADDTWaM0TpYSwMrTO7/vfOxJW 59cLGwqqSfW2AdQo9o2MRH0GmeYs9UNlTuF4QiYfIAZaAkc8zf3ceyXBxBLIGgXgZPLo X4C0zd/Ame3xlYpmSARk9d6+jVSfJkn0/+8xKTRwkoCBjPsYhyzadHNVr+rOIAbbhlNm xf8y4HKqyYuHCCe2uSzdvZr5V5KQyDLjO1eewJrT/vWvCbDUw91iNzyWSQZB4A4oJnbY A+zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778519534; x=1779124334; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1Ffx9yq19kp+YfhQJua5Fc4ABV19E4122HD3QSi0Mg4=; b=GmShnRn2fRlYVFf+KbDJVKG/UoXiw+514NO/FtptkwLm94k7vOe/Hoes58CRVnoeUm w+Fa8fLjWAboVdHv4TUlBuiaqmNWfG79Cb7ZwsyW3NjkUU9harF1d1TVk95fAblqByt1 /oB/baDyIH/jtm7TKDUCSFDu2Z5uKXhGEvT/cXLBYj5otsyQpCkcskT+xABfPPf1xa6c IBNr9Zrt51R0JHvjHrfQqMLEMe8yAjo1DUvH0vhAFedgsDZ4VMJhKpKuVLgzj7DarYdc aKfTIg75xzv24LC7xBdBbN21uROLjCLvY5tlsulvTd9OjX6zz9nXYw3z7cpRx6X/nIGg 3L8Q== X-Forwarded-Encrypted: i=1; AFNElJ/tEBgGfvaI+u88tB5abzNAaopUmO3Nby3ihWKtIOWXKz60mwCOy8edGKSzFeJiLxIWTtX9JOQFivWTedg=@vger.kernel.org X-Gm-Message-State: AOJu0YzM62OnwOlve7DojFBJ/GPZUarhG833NB04AFWMTtg7pEh/DkUB lHYTgI7s+oYsUIVkIbL9hvvPTN0ikAb3CBbCmetRbjbMQzQ8UtKvV99S X-Gm-Gg: Acq92OHqtcGe1oys4uEDYNiPAssQhU2O1KzK+VdFv3RRfWpYQxWEckVOyJ4bjyBOo65 lin85k42Ji9jF5APRKxgoBv/H6zFikAa/j2d+h3Qqvp59MIWHyCJJ4w+mCy4woeWIUBp3WTOK0p 5AGVabURsRYgZLYfGMu6YqNFCYKL7HRDhWqcadEexRDTDt7EX2j+sM/WcaCHLSrD85CqzgK6+0g ufaZMo6YSK1hyTSEmaUv+GCugse2rS1rGGbIqbdbAjHO4YDt7zzYsCdN2J9QsLW4saCSnNg1bXO 9zQXHnABAByxA1xuFKj9yQJ5ynHe+8ZLQ+5cHGM1B7kTy71m3fHc8WPDs5xkrAjVw1aEFhewHh0 +o/Hsq0l7MgYib4g0DMYIrvyM1S8o/IQd07Y6VFNjcWzDRWs+5elfatXR8JKR9rrO670QnK1sRA 3ot14n4HLHs0ug4kV7zTlcS/KICoT7qGBeuor72RsM4TDRegpOmWJaPM4abNMT X-Received: by 2002:a05:6512:3d9f:b0:5a8:6931:ddea with SMTP id 2adb3069b0e04-5a887add27dmr10425983e87.3.1778519533815; Mon, 11 May 2026 10:12:13 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 10:12:13 -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 Subject: [PATCH 0/6] media: vb2: Return queued buffers from start_streaming() on error Date: Mon, 11 May 2026 20:12:05 +0300 Message-ID: X-Mailer: git-send-email 2.51.0 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 buffer ownership 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 != 0) and the queued buffers leak. This was previously fixed for uvcvideo in commit 4cf3b6fd54eb ("media: uvcvideo: Return queued buffers on start_streaming() failure"). The same pattern exists in six sibling drivers that still return an errno early (USB disconnect, signal-interrupted mutex, or media-graph / format lookup failure) without draining their internal queued-buffer list. Each patch reuses or extends the helper / cleanup label that the driver's other error paths already use. airspy.c - moves mutex_lock above the !s->udev check and jumps to the existing err_clear_bit label, which already drains s->queued_bufs. msi2500.c - rebuilds start_streaming into a goto chain that drains the queue on every failure (including previously-masked set_usb_adc / ctrl_msg paths); parameterizes msi2500_cleanup_queued_bufs() with vb2_buffer_state so the start_streaming path passes _QUEUED. Rolls back isoc_init via msi2500_isoc_cleanup() on ctrl_msg failure. pwc-if.c - calls pwc_cleanup_queued_bufs(.., _QUEUED) before each early return; state matches the existing pwc_isoc_init() error-path in the same function. rtl2832_sdr.c - calls rtl2832_sdr_cleanup_queued_bufs() before each early return and at the err label. Adds an explicit success return so the cleanup at err no longer runs on the success path. Parameterizes the helper with vb2_buffer_state. dcmipp-bytecap.c - replaces the bare -EINVAL return for failed subdev lookup with a goto err_buffer_done. sun4i_dma.c - replaces the bare -EINVAL return for failed csi-format lookup with a goto err_clear_dma_queue. These sites were located by a Coccinelle pattern that matches `return -ERRNO` inside a start_streaming(struct vb2_queue *, unsigned int) callback without a preceding vb2_buffer_done() on the same path. Build-tested with drivers/media/ allmodconfig. Not runtime-tested on any of the six devices. Maintainers with hardware are kindly asked to verify nothing regresses on their device. Valery Borovsky (6): media: airspy: Return queued buffers on start_streaming() failure media: msi2500: Return queued buffers on start_streaming() failure media: pwc: Return queued buffers on start_streaming() failure media: rtl2832_sdr: Return queued buffers on start_streaming() failure media: stm32-dcmipp: Return queued buffers on start_streaming() failure media: sun4i-csi: Return queued buffers on start_streaming() failure drivers/media/dvb-frontends/rtl2832_sdr.c | 19 ++++++++--- .../st/stm32/stm32-dcmipp/dcmipp-bytecap.c | 6 ++-- .../platform/sunxi/sun4i-csi/sun4i_dma.c | 6 ++-- drivers/media/usb/airspy/airspy.c | 8 +++-- drivers/media/usb/msi2500/msi2500.c | 32 ++++++++++++++----- drivers/media/usb/pwc/pwc-if.c | 8 +++-- 6 files changed, 57 insertions(+), 22 deletions(-) -- 2.51.0