From nobody Sat Jun 13 00:24:00 2026 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (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 9D2E543E9CB for ; Mon, 11 May 2026 17:12:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519541; cv=none; b=S110YFM+gaOZd1t1V8oMsc5tEor6jK//fGhxg7sBX00c5LZ6EZQ3/+xJOGeETf8qIgWoyADRxn+4ohlTAFuYarFxcGhbMxRgXTXJA4ggI/OpiMLt8AZiXKuOZpZsoez2pSxqZuiujeet6dDbsTBVW0GaA4IYjcNOF6q/sOzK27c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519541; c=relaxed/simple; bh=qSesX2ZDGhaCZrzr8oezoBtstChG//vMkmqR9KwS7d0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JsKqq/n/OCvepth4Z2E4kXHAy9sCNJfhNC7fHL2eoEzGMtMHCIz0LT3XkRR12esObYlhek8whqjEnoQZn7qe6XNRS5NmbdgjRrVxQ+Jky/h9wdzDlQyu2AqiWiNWk1GcESFzY+6DZLpFSh6MhtK6HwX8xs46UPb2Thn04egd3Mw= 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=KcrY5pQu; arc=none smtp.client-ip=209.85.208.181 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="KcrY5pQu" Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-393d6025f99so39681571fa.0 for ; Mon, 11 May 2026 10:12:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778519536; x=1779124336; 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=s42sCXaEIYI2iT8o/2WjdzJavucMWxgVZFV2JYX3rF8=; b=KcrY5pQueoCa4MoLMldHSXm4iJ3/EjEqLttwIT098h1TCW6DCISHfy/6r+bVPtjZUx PXi9OeeW1CItkGfm2MWvoFrFhJk0H9QqqUMAueQeyRld7+9UTuOOYD+1coRjUw9UX3DU 9x/k4JKOtJGa5sXYnMiQSr4BeUEoHYuDchPWGlKMiIW7+zSPdBN1x27qIGLmDSxNncgz IbEHIJCOj7xlCuHB0Lqar+7TJmC/O67BmkZ510AYqaOzqoKqHf1R2LPZC+gPfEG++zkj QDhJuWdx6moAHmvyIvwEEnp+LalJIPiTqwp82itG6QHvpJRcRxvsHG87VOi8pEiQg03I YYXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778519536; x=1779124336; 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=s42sCXaEIYI2iT8o/2WjdzJavucMWxgVZFV2JYX3rF8=; b=AeHbr61oFNV/yiPja/3l3kiSinb1hRcFho02jKsop1mhpqMHxEFvQSE7S9zQIUdvzw 5FXf3W2TnagnzxVh3qNUXJpkPbrUY+K8IogDm1v5q23j/w/UDZJC+Y1yPMR8pacNeAXi KmZ78FRW92PkBvuIXHWTmEqL7zMJ6d5YyDTGJRZ//04cgw3BATPO1R+w0LxQ95loBCKS +R/x1LmgEG4XIF3gTBC+uRP12hRaujQ1umhnMFALsO5L2f1aAz/KJ0s3MgrIRQLX+rzY z5SZl8nSAZdhUrKE23HE6F+DW8XuGUeQrZoTbKqNsb6nEWfyBNwirPRWbSchWSvPR8aq RLug== X-Forwarded-Encrypted: i=1; AFNElJ9dKMJfKjrmk6NITVD4k7XF35pMca+Uf4/sayVlqBW7pMPoPc1UoP15/S+I2Ha0aWgCbRcVfM3lsjHXWDI=@vger.kernel.org X-Gm-Message-State: AOJu0Yzs0haF/nA3lP6ii65YUXPCSdxLnhGbay6XqkhJwWOhju/jD/xs WO0mUGo/fcb9LS9oB//N/ar4zTk1BYDki2QNnoPYZKQl9kDqw1HtWR7f X-Gm-Gg: Acq92OEb24lh0UqiV4SQX6HpvGmB7o/hRpFOdyybbvdxV8pVCTdg/+MHEKJNZ6i/yLI csvJapEHB1w3YkQ7VqpHZaHLByJ5wZZMyVjb3+Q2rmDDLON0UsflSAy/rDr2Un/XOCyf6Hog8s6 maV6UpIi1QbjKc/oOauibnh0qTFSg6gFfrWQQXofhgSXvLdZpL71ClO+Kw5NcMzr87je9H8STtR l1qjjO6bq/k8U5awCiMzf4KFFHcJrjAqDP2svU2j2aWxfJquLcb/ExerP3DmMfSE8u+6C0BeZPm xrab4Lln5V4NEGmhMTl8j9LSRswY8ToTQS2KU1dPA5B9KATbV3bfX7UMYu+t0t2WfzWR9vCdFFJ wYG24QgTRIRSPt7ssq0qDOjqoxtBAb649gzPWPKHBGDq9M6XFm+MlcGQ7g9Ecgujhi/5i8b8wIR kUTsQoFPcfd5RUk5NvvF3iiJJigfGaQF7n30icKg69EFkIpNce+jVjNqEsfb4yOk1BNwJBbQY= X-Received: by 2002:a05:6512:a8c:b0:5a8:99dd:1648 with SMTP id 2adb3069b0e04-5a8e0c8c320mr110927e87.0.1778519535453; Mon, 11 May 2026 10:12:15 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 10:12:15 -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 1/6] media: airspy: Return queued buffers on start_streaming() failure Date: Mon, 11 May 2026 20:12:06 +0300 Message-ID: <649601988189f031670215cb35add5e80439559d.1778518085.git.vebohr@gmail.com> 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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. airspy_start_streaming() returned -ENODEV early when the USB device had been disconnected (s->udev =3D=3D NULL) without returning any buffers that buf_queue() had already accepted. Take v4l2_lock first and jump to the existing err_clear_bit label, which already drains s->queued_bufs via vb2_buffer_done(..., VB2_BUF_STATE_QUEUED) before unlocking. This mirrors the uvcvideo fix in commit 4cf3b6fd54eb ("media: uvcvideo: Return queued buffers on start_streaming() failure"). Fixes: 634fe5033951 ("[media] airspy: AirSpy SDR driver") Cc: stable@vger.kernel.org Signed-off-by: Valery Borovsky --- drivers/media/usb/airspy/airspy.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/a= irspy.c index 8f6b721ba107..57edb42463e8 100644 --- a/drivers/media/usb/airspy/airspy.c +++ b/drivers/media/usb/airspy/airspy.c @@ -522,11 +522,13 @@ static int airspy_start_streaming(struct vb2_queue *v= q, unsigned int count) =20 dev_dbg(s->dev, "\n"); =20 - if (!s->udev) - return -ENODEV; - mutex_lock(&s->v4l2_lock); =20 + if (!s->udev) { + ret =3D -ENODEV; + goto err_clear_bit; + } + s->sequence =3D 0; =20 set_bit(POWER_ON, &s->flags); --=20 2.51.0 From nobody Sat Jun 13 00:24:00 2026 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (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 2059028CF6F for ; Mon, 11 May 2026 17:12:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519542; cv=none; b=LyO+R4R/S3gSk8wzenHAsXX77gIq+MpKvC1iXvvAP+a0YKdUNbwY2QyCSI8p0Og1exhySfa0ToAiAdw4u3lWCMcLjraRQi+SLa3C/Yv6kd3os5jbkpKOhknnzE/SjNX/t3ErN4yclW7s2TwvCSkhCkngeYBAhVViNXzv1BbDIRU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519542; c=relaxed/simple; bh=4DlyG+iXICv8PFIjVe2HgIrTduPnzOhVbzvai6W3884=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rj3f+n6h3gQq5joG/Pq2M7Z5W4nIPJTgsW+QO+5u65Hlj8mYG8YLSV8IsNzHvVfyxPsmHhRZWx5Z+uzfTuLSTDS3DbCga9XUvSscFcr0gWubYb2inRuhdtapzDMRLY3tTbUEOY7F9VkknthouAkTkX5gCb3TARrBI9TyzCgqHEQ= 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=M+V5Khs5; arc=none smtp.client-ip=209.85.167.52 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="M+V5Khs5" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-5a8cb92f26aso1280431e87.1 for ; Mon, 11 May 2026 10:12:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778519537; x=1779124337; 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=XSIxIJUh3eL2dSuA1xrUNZiqoyBIDeeVRxEk9r/yyRo=; b=M+V5Khs5sW5CnKNYTvSJ9U6Fhg9+w6YeNPtI+moPEmZTma0x4ZuGzYW+pwebfPyiYA 8eollKjLl9KhXsmzQ/Rjf3ime4ya9qQGo9uDjf5dphnRc7UvKwyHWEDgcIrLd4Am9oku Ui4QPMIQtqYEepdYjipQDtBFQ+Ib78PD9EdFzC1AnaD83ZglGb30EF5YxvwUyReZtYQO bWJoeAPA/j2ZPTBdaHM40JY6VOqqrHokz9VHi89qMpi/YWzJvzVB3+qaY9X+MYC71ZvP muRD8uYuXzgt4YntFqhfVVrdQYippWpVhME6oC22IFY9KskzGfA46CXzFuZQCIjfxR8w 7qdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778519537; x=1779124337; 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=XSIxIJUh3eL2dSuA1xrUNZiqoyBIDeeVRxEk9r/yyRo=; b=ExgKqOm3EJag+BKQmn6PuOVo8yvF+7pZKix5Y853imQ4I/TKNNnlbDtjOrWAdw28rg u48ureXaCzjmi78iUv3DUvHgxZfOfODRT+VhtBUgM7ZyOdPDaxOM1hAFKWT2LnFfZa+9 YguLETU/GJjOV2YV5ZbHQiSB42Ykhfuffz5xUR+QFZTFVZQRLfacVKOEOarJ2IZdSNBS 0p7woh1uJghIc49A/TVjH/HEd/cNklBkgQJou5aLICzGcufF1m9qtxmrN0ctMo2Mz/Wp CCFauLYH5LixdwIIzkCXc66090i8olCBiTaLMp8SMxjkJk3dEsIzzjgJcbJU4MsaROA8 4Y+g== X-Forwarded-Encrypted: i=1; AFNElJ8lO1REVlribUXYszH0f9d9U1/krAab91DnMIMpZd9X+4XOXw7+q6MvPRbOL4uw8Xdq2sGYykMDw43GL2w=@vger.kernel.org X-Gm-Message-State: AOJu0YygrO2mFWDg+pwtsFoRD5awDeTdyUBo/jpg8GFfOkIytbtjeTvA POhV0cBIruHzR8j7v8NqBgDAfr8NNMV5PdpWW1MqecYCLhNmaEAg45ov X-Gm-Gg: Acq92OFBtal5JavXPkt/9rvLP4mK+McvAXH3wEsTAAgk8jaekgDXQ6Xuk4NFnm9tXYN H5uDGia+z1auvBWaiAKoZyFpu3MrOmtBOpeTNRz1q28gvyHJULfQ97uxDFPVC4Fmyk4h5tLPTwN MiBH4EryBEiJd0M4sh6w/wV6GtLpQoBrSJhfmccm9XvTH1G8XApoduyjPc2/EcdfCrRWBqfVDUs h6u0gRn79qzu0JpdG8xLdatwhudQ8ejtr9EtfYDqpyv7dX4J/Y5OPQ8/zsgEOYLj/INpeOIjH4B Yde1pX/JDC16Kn41EBxyefBZRxmmpXkVOyNaYZtIBA7+ybE4J8Z7oyE2aEFbCkllFa2ixZ0Js8L aKxoMFqXtjGuyG6eiIS9mC85hMBUau8jv32XVx5Btkb7M81OerJhGZ1I9NaS6ofSV+QLx5UL3Ak aHlTqv6uXRduxX3vega/AC5l7cq8HgtF/8NWtfuLOGQbFrqc3KmxxxEry04RuN X-Received: by 2002:a05:6512:3ca1:b0:5a8:7be1:24c8 with SMTP id 2adb3069b0e04-5a887ceaa65mr9581194e87.37.1778519537055; Mon, 11 May 2026 10:12:17 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 10:12:16 -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 2/6] media: msi2500: Return queued buffers on start_streaming() failure Date: Mon, 11 May 2026 20:12:07 +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: quoted-printable Content-Type: text/plain; charset="utf-8" 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. msi2500_start_streaming() had five error paths that all hit this trap and were further tangled by ret-overwriting between calls: - -ENODEV when the USB device was already disconnected - -ERESTARTSYS when mutex_lock_interruptible() was interrupted - msi2500_set_usb_adc() failure: ret was silently overwritten by the next call (msi2500_isoc_init), so the error was lost entirely - msi2500_isoc_init() failure: cleanup_queued_bufs was called, but the function then fell through to msi2500_ctrl_msg() and again masked the original error by overwriting ret - msi2500_ctrl_msg(CMD_START_STREAMING) failure: no cleanup at all, leaving isoc URBs submitted with no way for the driver to consume them Consolidate the error paths into a small goto chain. Every failure now stops the function, drains the queued-buffer list, and returns the real error code. The ctrl_msg failure path also rolls back the preceding msi2500_isoc_init() via msi2500_isoc_cleanup() before unlocking and draining. The cleanup helper takes a vb2_buffer_state argument so that the start_streaming error paths can pass VB2_BUF_STATE_QUEUED (as expected by userspace on start_streaming failure) while stop_streaming keeps its existing VB2_BUF_STATE_ERROR semantics. This mirrors the uvcvideo fix in commit 4cf3b6fd54eb ("media: uvcvideo: Return queued buffers on start_streaming() failure"). Fixes: 977e444f59ad ("[media] Mirics MSi3101 SDR Dongle driver") Cc: stable@vger.kernel.org Signed-off-by: Valery Borovsky --- drivers/media/usb/msi2500/msi2500.c | 32 +++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi250= 0/msi2500.c index 1ff98956b680..0614087c3c3c 100644 --- a/drivers/media/usb/msi2500/msi2500.c +++ b/drivers/media/usb/msi2500/msi2500.c @@ -541,7 +541,8 @@ static int msi2500_isoc_init(struct msi2500_dev *dev) } =20 /* Must be called with vb_queue_lock hold */ -static void msi2500_cleanup_queued_bufs(struct msi2500_dev *dev) +static void msi2500_cleanup_queued_bufs(struct msi2500_dev *dev, + enum vb2_buffer_state state) { unsigned long flags; =20 @@ -554,7 +555,7 @@ static void msi2500_cleanup_queued_bufs(struct msi2500_= dev *dev) buf =3D list_entry(dev->queued_bufs.next, struct msi2500_frame_buf, list); list_del(&buf->list); - vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR); + vb2_buffer_done(&buf->vb.vb2_buf, state); } spin_unlock_irqrestore(&dev->queued_bufs_lock, flags); } @@ -830,25 +831,40 @@ static int msi2500_start_streaming(struct vb2_queue *= vq, unsigned int count) =20 dev_dbg(dev->dev, "\n"); =20 - if (!dev->udev) - return -ENODEV; + if (!dev->udev) { + ret =3D -ENODEV; + goto err_cleanup; + } =20 - if (mutex_lock_interruptible(&dev->v4l2_lock)) - return -ERESTARTSYS; + if (mutex_lock_interruptible(&dev->v4l2_lock)) { + ret =3D -ERESTARTSYS; + goto err_cleanup; + } =20 /* wake-up tuner */ v4l2_subdev_call(dev->v4l2_subdev, core, s_power, 1); =20 ret =3D msi2500_set_usb_adc(dev); + if (ret) + goto err_unlock_cleanup; =20 ret =3D msi2500_isoc_init(dev); if (ret) - msi2500_cleanup_queued_bufs(dev); + goto err_unlock_cleanup; =20 ret =3D msi2500_ctrl_msg(dev, CMD_START_STREAMING, 0); + if (ret) + goto err_isoc_cleanup; =20 mutex_unlock(&dev->v4l2_lock); + return 0; =20 +err_isoc_cleanup: + msi2500_isoc_cleanup(dev); +err_unlock_cleanup: + mutex_unlock(&dev->v4l2_lock); +err_cleanup: + msi2500_cleanup_queued_bufs(dev, VB2_BUF_STATE_QUEUED); return ret; } =20 @@ -863,7 +879,7 @@ static void msi2500_stop_streaming(struct vb2_queue *vq) if (dev->udev) msi2500_isoc_cleanup(dev); =20 - msi2500_cleanup_queued_bufs(dev); + msi2500_cleanup_queued_bufs(dev, VB2_BUF_STATE_ERROR); =20 /* according to tests, at least 700us delay is required */ msleep(20); --=20 2.51.0 From nobody Sat Jun 13 00:24:00 2026 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (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 862D344BCAF for ; Mon, 11 May 2026 17:12:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519543; cv=none; b=UnvImlMd2oAucwgLMiIMo8xgpYxCJ6XMQBxXqywLu1A3xHRR7paltZugK88wKh/ucg/wO0zm+BfC9nyvAMbAGlj0ET4F7NprHTwOib+op7Jkylf1Cm+VbwmhI3quU3WFHUgWNOWp7Y56wfyQouDzSTlbpffsXOVQ1EOZWRITkD0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519543; c=relaxed/simple; bh=Pm0arqbEMJSuzVfu2XbHYEXxhnKaEaOHkvubnY5Jb24=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PwVP/SFlSbq/7mPV2JIXKoCT+WwbKvuz29PZ7X9xjBMIUav6wjmW9NLSNELXhcIPOe8VKuVrvlxErtzX6HOrKatcSqTps/UBt8+xECI+nUjmFO7aJduQVPDJQE01MFmHLMUSDtiouCI7Ae7Cjn5PT1xOCbLMzvmGy3U5IOhFzzA= 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=dDNGAD3k; arc=none smtp.client-ip=209.85.167.52 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="dDNGAD3k" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-5a8d648466bso1132751e87.3 for ; Mon, 11 May 2026 10:12:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778519540; x=1779124340; 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=JH+u+xhzUiMSlilufXXl7nt5EV8IiDoOquYIB5049q8=; b=dDNGAD3k/0sAoDafWNHvzhoLdyZxDp3xurV7r/KgtXbByyqKpswBrGR1MqzPZgosv0 0qmLllYxGTQHzpTDgxy9m+IMNIgIFOXdFEWFIR7bQB6x+DGUhs9KJG0ONxYR3pdNrAi2 ygm1zRTUz09oMvwjGVZ6JkAEqeR3aUMiMAKKTDp1VBFY4ATP8wlJatzXtc1GeFttNIAU nVsmas13PW2GjeYG5an96ZtBFbpDRKqamBKaNfCNEqfY4XdMYbEn45TnUi1TsE0cYQy/ /nPtpGFE6wK8+u4tjUnxbAhYSyHdndXQ6Msv4I0kIXhEjeW1RqqwNvpCKerdAVMh2tQ7 DS2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778519540; x=1779124340; 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=JH+u+xhzUiMSlilufXXl7nt5EV8IiDoOquYIB5049q8=; b=PStAjQ66BKJBfx3bHcPMA8WDrx/7t3dKt3XODhYKK164Ru6BX5pxPH+A3r7hNJbHsX soc2vtOw6XxvmSIbLY2Idyn5hNz4ZzSZGHut5WYQqBeCBVPKu9NC5yzogC1XlBrwrybz OVE+8diRROMzgFXb29dy8MqDlBzPB8YYWoj1PA5U1sYMFGby9lyg/quW9TZK23o94U0X KYd+iDfc8sn2gUcIHeGo68nCJTDxtyK7JxhYzBApqF9+VAcqG71EWN6Ba2vgxVPorM3h ecDHo7GWu/XR+/q88bZIM47GUM4q39aI5k29ulEf0aFORkKPMcSyi+fyHSm5HAoriqXU wpQQ== X-Forwarded-Encrypted: i=1; AFNElJ87ekjHmJgzTnR5p4IHUwUNHpvQjQjFRI8JvchAW2I5ympFa0bu6HmFOVyBk1eUZdB40/NNf3+0sj92yLw=@vger.kernel.org X-Gm-Message-State: AOJu0YwcQ4xtSfL2NcgaYTf1p12PukvGyNYo7DSMScT31zZfxMATARtL W1lrYNzhOLcQHIlWWhF1cjEhtnQsUlmgGl7nTNrX9RdfZWx4Du+/EMH+ X-Gm-Gg: Acq92OG/CyeS1qKu+S931wpTbMRS0mRLsrL/S9KzjUPXUR7o1DXhIAx3ldwoMxngpBQ H2JhbUNGNvSHe+jbPTGBw02zxmxUkEkmhTjeeWR0eTRjibSDd3ayomLNLEPukeF5NHnDEQRdyU5 ZhO1gfXG0Zkzn4gqILNlOst/ANdEgeb2h8HM8lhWwBhjTwOYONnhf6Gve8izW/9x0W4f0kCV0D2 0AKyNlKy+90GYaLUxQl9DQaZmJAQZRccA7E05vlbxRuc0Ee/gk/f2FSEpDi9Xm6EE3beH0fqmel e1jJKFk7EOn8kmo1HyhOANtab1t3PCmLYB9VLKvR1/5L+6IrFIGh5jIbTXUdKHW+aSimP4Jhmnx +ArL20+x4gXS5Bck/V78/WuECVoZMKgSH3ubpaCe4hY2szxQVXin52pxlNdUb132SFN0ySY+oFr 5b3ascsoHQ93MAfPj66TELQSOKO0xxuqERq0UE+zOdkmuy87eeBP9kvodgzWgq1em8999A3+8= X-Received: by 2002:a05:6512:3e16:b0:5a3:ff5a:d83 with SMTP id 2adb3069b0e04-5a887ae3618mr10520299e87.16.1778519539315; Mon, 11 May 2026 10:12:19 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 10:12:18 -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 3/6] media: pwc: Return queued buffers on start_streaming() failure Date: Mon, 11 May 2026 20:12:08 +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: quoted-printable Content-Type: text/plain; charset="utf-8" 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. pwc's start_streaming() had two early returns that hit this trap: -ENODEV when the USB device was already disconnected, and -ERESTARTSYS when mutex_lock_interruptible() was interrupted by a signal. Call the existing pwc_cleanup_queued_bufs() helper with VB2_BUF_STATE_QUEUED before returning (matching the state already used by the pwc_isoc_init() error path in the same function). This mirrors the uvcvideo fix in commit 4cf3b6fd54eb ("media: uvcvideo: Return queued buffers on start_streaming() failure"). Fixes: ceede9fa8939 ("[media] pwc: Fix locking") Cc: stable@vger.kernel.org Signed-off-by: Valery Borovsky --- drivers/media/usb/pwc/pwc-if.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c index c416e2fc5754..59b99ac8fcb6 100644 --- a/drivers/media/usb/pwc/pwc-if.c +++ b/drivers/media/usb/pwc/pwc-if.c @@ -710,11 +710,15 @@ static int start_streaming(struct vb2_queue *vq, unsi= gned int count) struct pwc_device *pdev =3D vb2_get_drv_priv(vq); int r; =20 - if (!pdev->udev) + if (!pdev->udev) { + pwc_cleanup_queued_bufs(pdev, VB2_BUF_STATE_QUEUED); return -ENODEV; + } =20 - if (mutex_lock_interruptible(&pdev->v4l2_lock)) + if (mutex_lock_interruptible(&pdev->v4l2_lock)) { + pwc_cleanup_queued_bufs(pdev, VB2_BUF_STATE_QUEUED); return -ERESTARTSYS; + } /* Turn on camera and set LEDS on */ pwc_camera_power(pdev, 1); pwc_set_leds(pdev, leds[0], leds[1]); --=20 2.51.0 From nobody Sat Jun 13 00:24:00 2026 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 745474534A8 for ; Mon, 11 May 2026 17:12:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519545; cv=none; b=Tbg8GoEgydgJ0c25//hEiDGFQuqKQh+c9C6+bOqB5DQPfvGl4FBMso9sorH7HxT79eMxzZxks/qaSyNKokAbBdIcWRdlQCjHEH/tsE64wSsyokMrzkCKABqubNOB66MweMT+ij3UIvgon6wPrthkaCH6sq7miCCPdnSwKPbZNd4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519545; c=relaxed/simple; bh=Uc/exHc2g0MJR9S71NefJro1J1WlH0FhS5OXlnyqzIU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lXI8i3w+/fjI3Pl931hX09OOfEawnZyqZh3o/kMzFGqSkXtQq6cu6DEiElol0kM7dkYIj5c6pnhm5i4WAyUnr5FxyrvlrSkHJF8qC2CsKzVgEubuTpACSKAiodeff3JT7zmMRNHtS2mrKltfFbuqb6JYWct9pWgAbBfKFcVwjCU= 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=q8N3d+r2; arc=none smtp.client-ip=209.85.167.50 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="q8N3d+r2" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-5a40cfab24dso5041978e87.2 for ; Mon, 11 May 2026 10:12:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778519542; x=1779124342; 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=TypizH+0naDcsiSshXyXpAX6OorxUGA4/sCVC58lq0U=; b=q8N3d+r2CRulpoPwLMljHh7rjrIyIDO8P1Ty/nZj6Y3zt/njB+NZOX+Vp57ATOskza H4mHzk6hzmcTFehT4xwrqLEbYTFXgFgw7uhxgysFnSw8E+ynjM/R0M5Dm/xjJ5AQbaGj y5rVxqMBO40p3rB+BPS+/0gOCt7pXRmVGSjNxGDubJhrqCPO1Bx/emnwziUy/jDRfjVu BOVO2baKGEfH8aHi2yWscfBO1cNOupG5DSwU28wu2yT124619X5b90kXCs/TJLjcK8Wt h1k+4R1IQS3tAAXd/p1yaW774D/DJt9CJwkJ5UrHQ82yhUQ0Bq5LMyuKe6yVxjECmO8R qMTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778519542; x=1779124342; 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=TypizH+0naDcsiSshXyXpAX6OorxUGA4/sCVC58lq0U=; b=DEuXK/lKSh9Y/PE/211uBDWXIamGslPeBXDhyMPyks4eQ4GAM3/8/excJylQBb3VmK wGtWdcZIdofqmOde3Di6i6f0S2L3qeFcd2MCI0cDfiYNTyWz5jDGEglOPnLz5cgKSZ5a ptIzXR6nbdaXjG6w+OVhoh+rWnBc8vf4C4nqmWDQB9lfY9s17pjEhJXem0uy/dmR7tUA 7dcK+bksuhiNY6oRc8xRNTPCSte0SnS4pr4hTk7eRBi1PJh22bEhRZqoy+GX31zCg6gE 1v1XbqZtjHUuGUxxYopbzeu6rPT46fh6AId9GVNccEeScZNcUvZwKF2N5UFSfLrxkKqp 3Oqg== X-Forwarded-Encrypted: i=1; AFNElJ9BxB0B7cfO587gsUCCcRHmoK4RpjkjsXtax44PIQzJxQ7a3N9p1oLw1C6NgGZkM7bG1vxctV265NkaAj8=@vger.kernel.org X-Gm-Message-State: AOJu0YwF1IX1LnD/090SPUU9Nc7yrFfSV3/razzP2mlCqcoS1ZrvWHr8 zTG7MKcD5JpDZId6xfgFJTu9wc0vVSDe96oz1MOHeEgCtAuQCywjs8Bp X-Gm-Gg: Acq92OFrSZt/DPcRXEEosxHGmoRQL2BXZgSjPTa18zCIIetal1wCPZuB8t0B22X0GHV AQ7Cx8YvvDqvixH2XQIIdFi56W/eHdpQ9JPvsU5L4qrEoPsMC7XoYPL82EpP6asMa7bLumeunNZ 22RvHWKozZYhIqRheSEt0960gmhxhInbwyaTmuknuCSLMc6XoWIXxMKRZ68wh9NDUcpSbWuQodb 1HyuSg6yxFBDkq3bNkxCU56JKP+vlJl3LAc0+j2PO7DUJljHGuW6jyWsXKM6Wln85ahe7H0lmDN VE2U6GC8z5EJ+zxthuLVX+Z00kJBuDfhazy/jeky3BAh5AWfHSJk7ZQ4Uovff+Frf+DyIOG4gEt zS6gh8E85IGXWJggrw9bSIl4kufNq0UpE4hFubxqxmddDZvhYY48f+J+vWsUnmvpDzEwq/fzr1h 6dVWf9rwv9dcpmzMV8edEzmoQEdi1BKHxLjdHF8fVesgZDBQIS7AjeVZlSN/Av99h7C/8ZTho= X-Received: by 2002:a05:6512:b20:b0:5a3:fe60:471c with SMTP id 2adb3069b0e04-5a8a94a8fcfmr4465968e87.16.1778519541397; Mon, 11 May 2026 10:12:21 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 10:12:20 -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 4/6] media: rtl2832_sdr: Return queued buffers on start_streaming() failure Date: Mon, 11 May 2026 20:12:09 +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: quoted-printable Content-Type: text/plain; charset="utf-8" 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. rtl2832_sdr_start_streaming() had multiple error paths that hit this trap: two direct early returns (-ENODEV, -ERESTARTSYS), plus six `goto err` paths covering subdev s_power, tuner setup, ADC setup, stream-buffer allocation, urb allocation, and urb submission failures. None of them returned the queued buffers. The original function had no distinct success exit and fell straight through into the err label, which previously only did mutex_unlock and "return ret". Adding queued-buffer cleanup at err must therefore be paired with an explicit success return; otherwise every successful start would also drain the buffer queue and kill streaming. Add that success return, then add rtl2832_sdr_cleanup_queued_bufs() at the err label and before each early return. The cleanup helper takes a vb2_buffer_state argument so that the start_streaming error paths can pass VB2_BUF_STATE_QUEUED (as expected by userspace on start_streaming failure) while stop_streaming keeps its existing VB2_BUF_STATE_ERROR semantics. This mirrors the uvcvideo fix in commit 4cf3b6fd54eb ("media: uvcvideo: Return queued buffers on start_streaming() failure"). The err label still does not roll back power_ctrl(), frontend_ctrl(), the POWER_ON flag, or stream/URB allocations that may have happened before the failing step. Those are pre-existing leaks of a different class and are not addressed here. Fixes: 771138920eaf ("[media] rtl2832_sdr: Realtek RTL2832 SDR driver modul= e") Cc: stable@vger.kernel.org Signed-off-by: Valery Borovsky --- drivers/media/dvb-frontends/rtl2832_sdr.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-= frontends/rtl2832_sdr.c index 422d1a7b5456..c564485e3bbb 100644 --- a/drivers/media/dvb-frontends/rtl2832_sdr.c +++ b/drivers/media/dvb-frontends/rtl2832_sdr.c @@ -399,7 +399,8 @@ static int rtl2832_sdr_alloc_urbs(struct rtl2832_sdr_de= v *dev) } =20 /* Must be called with vb_queue_lock hold */ -static void rtl2832_sdr_cleanup_queued_bufs(struct rtl2832_sdr_dev *dev) +static void rtl2832_sdr_cleanup_queued_bufs(struct rtl2832_sdr_dev *dev, + enum vb2_buffer_state state) { struct platform_device *pdev =3D dev->pdev; unsigned long flags; @@ -413,7 +414,7 @@ static void rtl2832_sdr_cleanup_queued_bufs(struct rtl2= 832_sdr_dev *dev) buf =3D list_entry(dev->queued_bufs.next, struct rtl2832_sdr_frame_buf, list); list_del(&buf->list); - vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR); + vb2_buffer_done(&buf->vb.vb2_buf, state); } spin_unlock_irqrestore(&dev->queued_bufs_lock, flags); } @@ -855,11 +856,15 @@ static int rtl2832_sdr_start_streaming(struct vb2_que= ue *vq, unsigned int count) =20 dev_dbg(&pdev->dev, "\n"); =20 - if (!dev->udev) + if (!dev->udev) { + rtl2832_sdr_cleanup_queued_bufs(dev, VB2_BUF_STATE_QUEUED); return -ENODEV; + } =20 - if (mutex_lock_interruptible(&dev->v4l2_lock)) + if (mutex_lock_interruptible(&dev->v4l2_lock)) { + rtl2832_sdr_cleanup_queued_bufs(dev, VB2_BUF_STATE_QUEUED); return -ERESTARTSYS; + } =20 if (d->props->power_ctrl) d->props->power_ctrl(d, 1); @@ -900,7 +905,11 @@ static int rtl2832_sdr_start_streaming(struct vb2_queu= e *vq, unsigned int count) if (ret) goto err; =20 + mutex_unlock(&dev->v4l2_lock); + return 0; + err: + rtl2832_sdr_cleanup_queued_bufs(dev, VB2_BUF_STATE_QUEUED); mutex_unlock(&dev->v4l2_lock); =20 return ret; @@ -920,7 +929,7 @@ static void rtl2832_sdr_stop_streaming(struct vb2_queue= *vq) rtl2832_sdr_kill_urbs(dev); rtl2832_sdr_free_urbs(dev); rtl2832_sdr_free_stream_bufs(dev); - rtl2832_sdr_cleanup_queued_bufs(dev); + rtl2832_sdr_cleanup_queued_bufs(dev, VB2_BUF_STATE_ERROR); rtl2832_sdr_unset_adc(dev); =20 /* sleep tuner */ --=20 2.51.0 From nobody Sat Jun 13 00:24:00 2026 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.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 5586746AEE5 for ; Mon, 11 May 2026 17:12:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519548; cv=none; b=GHBm23l+qO+fE/wKgdJ9k8o2jNHWIQ3s7iZi3IARowiTqn95hO+/tFYiPKpc/pmnCTVsbrgbEnsNcdwlDHRAJ8vegDJzWWNSJoAJuuVntyvTTULMfOeIfcB7WgzJDvmUfc0vkmxGYydcclxn7y2PVzrsqHUdIOXdFj2sooTej3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519548; c=relaxed/simple; bh=EB/e87XuFCPUJ72NiJ6scGbM1z6scuWykz1rqgsY/mQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fJjiWljXFUGehnEGXlqjWgH13CUCo/FLgBlTEfbfAJ0i+ijntEi1tuyDYbqJ1AdFFFJic0otQzVUERvb2mqS+n47yDrQZVUaQZIhW2WxMAouEkVfd4qpDkWVbVHso7i6C+ixVCKIF7+o673tjWinM+C6ybTm8SDJ6d9JfGesDdM= 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=PjhzhaPR; arc=none smtp.client-ip=209.85.167.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="PjhzhaPR" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5a865d1547aso5116406e87.1 for ; Mon, 11 May 2026 10:12:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778519544; x=1779124344; 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=fxqdxYVfNyLoxNKHswDJZT0z/g1AEcUqUWKcspgGBc8=; b=PjhzhaPReJcaowg8zFxZPNbzVtMQAnjvdXilDrhccdbcSwsqziux/y5gSUAPeW7sGH 1RbUt5Nc/oUawa9unvDwS/dmL1T/uYchbX8Cvkq6a22Pl5/UB9vooV6rNiHgHjTO9/6Q UvQ1tE2XDKNahZ9+tXOtZiAOwzgdzziRevnpBE8/vTRuVJNuQ91qN0Vg1fojsEkjMUT7 V6TNx43ZaQnhpY9XSaL2mHV/iCDH1DDErlco4EpzNvbiAcqHfQytiFpdaa0AWWWhR1ax Mi9uTKwi7AzBmgRwO1O/X3MU2zsosOfPxJzScnqv7u5sfDZ7AT73ddm98wxK0ASS02qK Q5Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778519544; x=1779124344; 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=fxqdxYVfNyLoxNKHswDJZT0z/g1AEcUqUWKcspgGBc8=; b=TpYTeRptn/fqeFkuHzRECgqksWvk+OybYLgMDki3L6k/HHEOMTR7H9dTkn1Zye8p6L nmp3gxOoKhfTEcsF5GSKOA1RItnOzVU2ujblLI6ZcizBg8BvpvjdrM1P6hltI8F2LiGq Td/gAHdD5qjzzSB4yoBoYVpvLl2I5kAz9H4aYmbOjpcXJpOyjVi/zWmClRgnGjahT9zr cn1wy1bKtoEEXiwwc4qE31Ar0Ok7qianMcOLxGo5ok9qL8go525JeCNE8E8626dCux0f kqW+SorwLYtHQeWvVWX+ximtx3auNp2glyN4vwudMx5y8Yrek8qVlVHLOFneYdhhYhLC Q5Lg== X-Forwarded-Encrypted: i=1; AFNElJ+c9bSSOZUyPAF760xSpk7uyleETgDG85fwxeetaRzrUi/z2I9gImgfDZeRx4aGmJSgXegk3XgOSK4jAdw=@vger.kernel.org X-Gm-Message-State: AOJu0Yy119DlQmuf0rVjOWsmaQRCzOOUNC0lMS2c5RSpqioU2ZnlAozi teX2ll9kiduy4v/iO04s7uEy+J74fd5g+GAyvPWmke1Ge2OfWE6ECdBa X-Gm-Gg: Acq92OFjvK4X9VMgNGHM2KecLCn/yiVTkQhKZcSp6J5FO15ZnfqVRyMk+s901beegd1 foOuHLRRkOpsUrrSkoj/TbDu055UF2Qekqk7rLpX2lOy7sizarlTTsHMB4/nJ387VniBBKVz7n7 gjyUl94zpcOY2mS+uz+Z1XD8cHUmDh+YcNBTDh2yirjWTKytTNa2QJQakA8ZkCb7Lfprraw36aV zfzzylnsklS7imJ+AX/p6Arir2wvtsbPvqRyzS2VHcNF8hRPkWOV6HxLaLudf/fWnsaOFSy+RB1 dd5KBjKnuiUKU5+anh9BzyPLzYd53Xek0BlYcGPMRcs7JqPhHYBN7btRvbHcMG8rA8GHG4EulKO sPeIezRzuZ0h3CIP/dkNuI7IWAb1BffGsXxFQiM1BC/wV2S26GDmYY255pZ3mOlVy6FE1XsakMa HLq6BE83/dqXJpKqxIOWTv85WYcao9nPsCUtL2GpdjrzZOy8DXQZAxOQA5lsAR X-Received: by 2002:a05:6512:2309:b0:5a2:b86b:56c2 with SMTP id 2adb3069b0e04-5a8e0f35137mr91615e87.21.1778519544242; Mon, 11 May 2026 10:12:24 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 10:12:23 -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 5/6] media: stm32-dcmipp: Return queued buffers on start_streaming() failure Date: Mon, 11 May 2026 20:12:10 +0300 Message-ID: <3b7c3d1be61bcf092484016e25e7b8add98bbe0d.1778518085.git.vebohr@gmail.com> 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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. dcmipp_bytecap_start_streaming() returned -EINVAL when the source subdevice could not be resolved from the media graph, before pm_runtime_resume_and_get() and media_pipeline_start() had been called. The remaining error paths already converge on the err_buffer_done label, which calls dcmipp_bytecap_all_buffers_done(..., VB2_BUF_STATE_QUEUED). Jump to that label directly: the intermediate err_pm_put / err_media_pipeline_stop 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: 28e0f3772296 ("media: stm32-dcmipp: STM32 DCMIPP camera interface dr= iver") Cc: stable@vger.kernel.org Signed-off-by: Valery Borovsky --- .../media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c = b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c index a42f43d19f9e..f0e809458489 100644 --- a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c +++ b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c @@ -401,8 +401,10 @@ static int dcmipp_bytecap_start_streaming(struct vb2_q= ueue *vq, */ if (!vcap->s_subdev) { pad =3D media_pad_remote_pad_first(&vcap->vdev.entity.pads[0]); - if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) - return -EINVAL; + if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) { + ret =3D -EINVAL; + goto err_buffer_done; + } vcap->s_subdev =3D media_entity_to_v4l2_subdev(pad->entity); vcap->s_subdev_pad_nb =3D pad->index; } --=20 2.51.0 From nobody Sat Jun 13 00:24:00 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/m= edia/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; =20 csi_fmt =3D sun4i_csi_find_format(&csi->fmt.pixelformat, NULL); - if (!csi_fmt) - return -EINVAL; + if (!csi_fmt) { + ret =3D -EINVAL; + goto err_clear_dma_queue; + } =20 dev_dbg(csi->dev, "Starting capture\n"); =20 --=20 2.51.0