From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 CD0594418F0 for ; Mon, 11 May 2026 17:12:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778519543; cv=none; b=TtaNMmZ70kL2w8CG7xxCEOZFlFGmU5g19cN0WQoTiXf9H4fCLWHX6uB5TdA5j4FJWM/t3C+UxUttX4hs7CltpupJfs3BsKkhF2VuvB8xPgP7fnInai0nPSAYWe1rktPPf5qraoBuMdyZm5/vx/k4xl5OPO1CNw5JN6qVNA5eiOg= 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.41 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-f41.google.com with SMTP id 2adb3069b0e04-5a887ebb416so4275868e87.2 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=UEu+gJB+KH3EPkxsfKaXvZyDXvm6lIVXb9aOaegsMNnaK6zPLHdytox1JsZTMzBYow uk4bw58Efk1p7cdEKFnUK2UuyFGsEofnHQ3NccBNahiD8J+B1GbwD2hHaiWGkOGfkese ld+jVSF/2IQjdNLpXfVLMT8XpjUjOpGx9zzAN2D/VLjozFE1JOGSIj2dT8CvVx82pxHJ a1JR+ccRNbc8qWuWcn29bZ6cFMiJYYqod54ahBgZmQSdu7nnE1ebLi574kwhzJ6NaHOR LFPwhU0YWFlGcBuXH5nWsF/fWziZ3ZCRwtj1ECd4jutAz5rQMBglDUqqPJqIh6wO8rIh xs7A== X-Gm-Message-State: AOJu0YwNVd4mRm2CQ/FPGbrAV+UKFb0cmY2YIEtL9MKCb7WKhzm5RgaO YLL7ktktTdvRmRDyr548g0tXBSLhonOqtThTyCMzDPlyR8V9ntjip6gqRpd+nR03w3Fe5z384t8 = X-Gm-Gg: Acq92OEVJLGjSqWRGSnzx1Hh70ybZ/+oXE22qebR+mwB3iebnzASoqz9RSbzcyPFZkh T6jEI3CBJcX3oHiOeAaHOFs/G0X/wyqYWsxaWaQmOlQCSYkr0T81ykL1eaDFWeug9krre0YVhuI 6hEY589bDRPJi7Q8mz++WZ3fVjv3USZbRtnTkb/wRWrkStVTAOIlZfcZHW1S9gttgKHZB+1tAnL XjKxZltZd1XG9UfTj6SRarXFzDuydrBmoBnZb6dLaO6JXVtdZoR3jX+8JXsHwFC9+h+tirq/6Ho 1eMpodsMQN7rMUzy7bBAD5Ob2uL4e0vJv0POutRTLvwFHpaNxyP5Ec2LZT7a+c3/+qQr/3hiePF 9daejHsJIhJnOlA8BQDEYE/h0CQSOab79/rQS0gxKCsEricwZdYX2XR70cJ6d5OZZXbXzlLwC+I ao8433U2uA/mgObYnruNRM9N/D8/4HAlFaiJibSpM/h6K9GBmM6x0H10X/bkKKsG/r9KRqgFM= 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-media@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. 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, unsigned int count) 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]); -- 2.51.0