From mboxrd@z Thu Jan 1 00:00:00 1970 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 A231B43C7A6; Thu, 30 Jul 2026 15:15:09 +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=1785424510; cv=none; b=LGVEoV/90tv3tLozVpEuFUwaO1moZrGZkiJXNJpIwKxAP89ea6xin97hOW8AXeyvj99FkglqTnPxL/Z7rnTMGjuLhBsEc7RGKOhlzxqBUa3yflkDx0SEZRX5ZoFJ41h3eL3T4DEoodwxqCbdeWpuQ6/4qFHel6HefRb5f8fdcUI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785424510; c=relaxed/simple; bh=fzGtNVqbiqIW4kEn2vxIOvwb5inWcXvSW6xzSLGk+lI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kMKwmTJ8aQGXstdYT+i7lUzD2FkvaKOuG8xFjZLbEMY13p9RUh4e2/Qr0NTCvjw5YA+rAh+8KDsLh6uBGEiff26M/LebHxTQ+BbdwxtTLC+2QGQ4zSNRLKpCGxbwLpwX07mxd0XwV/Jo1+nwOkwO6oC94uCZYUeoz9FjDlJWo20= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NI8qvNFn; 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="NI8qvNFn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE6141F000E9; Thu, 30 Jul 2026 15:15:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785424509; bh=uH1jGuHZ5Mlvq+EuzLGRTS1Wp1GzcuqV+CTIM/azwNk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NI8qvNFnJHLmAfMXNWBzJ6qtE66HzwbY9mnsJQmeUresJa5YjNp2XWxJZsL56A2B+ MQ5vIiVwy/OEt1aG/X9p3IpYjSY+TEdrwVjrbfszP5wlvz61im25WmOnktGnAeyTWy RriJfjYRwIHnddTgGvR8Dbdaeew1kun1ApagZt6g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Valery Borovsky , Hans Verkuil Subject: [PATCH 6.18 420/675] media: pwc: Return queued buffers on start_streaming() failure Date: Thu, 30 Jul 2026 16:12:30 +0200 Message-ID: <20260730141454.059641682@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730141445.110192266@linuxfoundation.org> References: <20260730141445.110192266@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Valery Borovsky commit 975b2ee20e569d47821e4f6c9761b4664d48a6a4 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. 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 Signed-off-by: Hans Verkuil Signed-off-by: Greg Kroah-Hartman --- drivers/media/usb/pwc/pwc-if.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- 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_qu struct pwc_device *pdev = vb2_get_drv_priv(vq); int r; - if (!pdev->udev) + if (!pdev->udev) { + pwc_cleanup_queued_bufs(pdev, VB2_BUF_STATE_QUEUED); return -ENODEV; + } - 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]);