From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) (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 3F724363081 for ; Fri, 17 Apr 2026 05:19:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776403179; cv=none; b=BPgC3X8DiFSOqUNHATz/jG4xuy6AwLgIlX0IxFTsFNB0J61ciFMEK0FLMD/BxGgsw+njIr3dhxHqaq+5I1Bq3F8EIEGoBZRGSeDwpbXNWZP3WSehlwCNhz0htkT8/+BnPuZ2qJdxPFYmoXzDB1ChrtmhoJCKuFKTSwPa3N/m6Uc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776403179; c=relaxed/simple; bh=6cXnR11AY9ml1d9hIfJBq2oGPFWYViO0i3fyyo+E50s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q41yw7okeM0aEfAwQTSRcygeX5SqfiX4UxiKPJrMDLzUsziMFUOHNtQdjd/yUb2P+cIx5AAeo6BDBkMlCpC+K+gFW99rUiUGH+vgl1n098Rh+VwTPgy5hZ/ZCKws3ljt/ms/kH80FCtsHkX4V2zp1dnDdnRi8tZx6cXwUHZWq3Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=OfGHRxu7; arc=none smtp.client-ip=209.85.208.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="OfGHRxu7" Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-38e96a071c3so2966921fa.0 for ; Thu, 16 Apr 2026 22:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1776403176; x=1777007976; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=IoIm2efe3+/Yu0jHwJFHPW2lBg8zlPP9DqLMDf5q0Uw=; b=OfGHRxu7mYvMQDpY64sXDlWVDgldOYcA63RIJ1ftHBwNvJy5nVS+zv1gaBVrMZE/EN dKddqaxol8jnHwOMA4ooxQQf1nxwbTWaqWriUnggIR+wKlLry9S9HlPQPFBshVRxd7wD eh4titzNZFAuZEWC4gbfY9WqE3I2sbVBTByTc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776403176; x=1777007976; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=IoIm2efe3+/Yu0jHwJFHPW2lBg8zlPP9DqLMDf5q0Uw=; b=EF/cmKB3jFs/rop5wtBGkcRMMZGVARHWaxAFjXP/pobaV8rB4KukV4OfSmLWSQsbzI xe+fanCDpVXaReAvV/wrjF6/zWkRLDK2SOSQoAI4eXta8itCBKkS90VmkMuAmwGK1rVy Gr7vbUeu/gRZn9NQ/T9xks+jFtUo5Tc04X+rYy1LPBwCFQm6ssEtfE2fPEDgq+C4w6DA 9RODY6VhCaOdMwFejwy/JimxlHVGVWQjRI3DRc5MwQU+2NhjL5R5b0+hjsWLNRs6Ojln PCJNNQGZzDy3SZnV3JhPhcUjUmDvDwiEJUhu5/O+AjNWNHFZL76oS21ul7/9/nKtLMkt 6CRQ== X-Forwarded-Encrypted: i=1; AFNElJ9VdPaBkRoHlj4V2HaiwYItp/5O3B8XVFOYbBFBFZllSPsIsAirFS/BGgerpM70PXfAQMeYtPbCKeq/XAQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5MRf8gPAfbU9kGVY6MmhhvAIzceLuSvereArWL20qMVD/hHjg QsPv2PV2aSkURHjk/1RFLohr96roVC863Iam7dGhjWqgc9xA7GA6dJph6ELNhaYaIw== X-Gm-Gg: AeBDievML0owjmY3gvEPmRSjkaxb4fUwxiyweNIshQ0LmgVI+i13b4S+K4lIMh1w7wJ ypx+DuJpfOBUeidwPw/rrd4WRAhp2a9WV4MfmerhdsLA08yp5P82FPDIEgk/VB/VGsmzFF66gGk yq8BmeqJjWqZmHbKaslWyjO10cLF6JASr39jNrvAXRcOR5z3CP8a8qWbEl7if0G3XEHRCqZEnww 22avU334H+3v+V1d9QPnZHvCc6fGiAggQrqHyWKd48/LwhUV3N5XIRV63zKnXAXSX7SRa1ZrvvE RGt6OXbKhS7Q85chtBYyBPMq3TqXrGGCH/kmRuKChufIDa3PQpnY0PMgYa4h+NRGl9g8J/LzuXa s6AsJYEL3WBSMz+P+msoaewtZOG6/qXjwjZJR9n/qDpky7Gl2E0XOM4nKsVptzU0atV2M3slgPW 61mCrb1ixvtzXShegpjmGB0cFxIfmEsBSHI5b4AFFw6uW5zg12Z+P65JFgJp9qmeTj3/xSOfLvd SilatTh+VEZ5xlVeA== X-Received: by 2002:a05:6512:3d17:b0:5a4:3fe:9d41 with SMTP id 2adb3069b0e04-5a4172b7a9fmr341349e87.3.1776403176388; Thu, 16 Apr 2026 22:19:36 -0700 (PDT) Received: from ribalda.c.googlers.com (52.163.228.35.bc.googleusercontent.com. [35.228.163.52]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-38ecb4f5035sm1293491fa.4.2026.04.16.22.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Apr 2026 22:19:35 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 17 Apr 2026 05:19:29 +0000 Subject: [PATCH v2 2/2] media: uvcvideo: Avoid partial metadata buffers Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260417-uvc-meta-partial-v2-2-31d274af7d2d@chromium.org> References: <20260417-uvc-meta-partial-v2-0-31d274af7d2d@chromium.org> In-Reply-To: <20260417-uvc-meta-partial-v2-0-31d274af7d2d@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.3 If the metadata queue that is empty receives a new buffer while we are in the middle of processing a frame, the first metadata buffer will contain partial information. Avoid this by tracking the state of the metadata buffer and making sure that it is in sync with the data buffer. Now that we are at it, make sure that we skip buffers of size 1 or 0. They are not allowed by the spec... but it is a simple check to add and better be safe than sorry. Fixes: 088ead255245 ("media: uvcvideo: Add a metadata device node") Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_video.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 5d45c74c6041..cd77ca6f8136 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1149,7 +1149,9 @@ static void uvc_video_stats_stop(struct uvc_streaming *stream) * uvc_video_decode_end will never be called with a NULL buffer. */ static int uvc_video_decode_start(struct uvc_streaming *stream, - struct uvc_buffer *buf, const u8 *data, int len) + struct uvc_buffer *buf, + struct uvc_buffer *meta_buf, + const u8 *data, int len) { u8 header_len; u8 fid; @@ -1278,6 +1280,8 @@ static int uvc_video_decode_start(struct uvc_streaming *stream, /* TODO: Handle PTS and SCR. */ buf->state = UVC_BUF_STATE_ACTIVE; + if (meta_buf) + meta_buf->state = UVC_BUF_STATE_ACTIVE; } stream->last_fid = fid; @@ -1435,7 +1439,7 @@ static void uvc_video_decode_meta(struct uvc_streaming *stream, ktime_t time; const u8 *scr; - if (!meta_buf || length == 2) + if (length <= 2 || !meta_buf || meta_buf->state != UVC_BUF_STATE_ACTIVE) return; has_pts = mem[1] & UVC_STREAM_PTS; @@ -1552,7 +1556,7 @@ static void uvc_video_decode_isoc(struct uvc_urb *uvc_urb, /* Decode the payload header. */ mem = urb->transfer_buffer + urb->iso_frame_desc[i].offset; do { - ret = uvc_video_decode_start(stream, buf, mem, + ret = uvc_video_decode_start(stream, buf, meta_buf, mem, urb->iso_frame_desc[i].actual_length); if (ret == -EAGAIN) uvc_video_next_buffers(stream, &buf, &meta_buf); @@ -1601,7 +1605,8 @@ static void uvc_video_decode_bulk(struct uvc_urb *uvc_urb, */ if (stream->bulk.header_size == 0 && !stream->bulk.skip_payload) { do { - ret = uvc_video_decode_start(stream, buf, mem, len); + ret = uvc_video_decode_start(stream, buf, meta_buf, mem, + len); if (ret == -EAGAIN) uvc_video_next_buffers(stream, &buf, &meta_buf); } while (ret == -EAGAIN); -- 2.54.0.rc1.513.gad8abe7a5a-goog