From nobody Thu Dec 18 06:53:21 2025 Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (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 93F0E266EF0 for ; Thu, 13 Mar 2025 12:06:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867591; cv=none; b=JHCDT/layh9EKHiVUMQ3k81DqCL6BKz4iFQdBqyL2CzBClW/s/1K2WiPZ1fzV5DptqocdwbcQ49lJXIjCJBoRh5BBuuF1YKkUEincDWTCsAOXCFpC9iGvLmIMON9FOgW6B+tdgG840eY6s8G83JA2wDtPhQPMVKHizuMu2iBqiA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867591; c=relaxed/simple; bh=TdeKYj+nKDmLMq5rDHi0EKfmM8Q9c+Fp2RgC37HVEwQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mlPHh4N6QzHFiI5RCedtDlqK+2g7lNlPK7ASUFEJ78cwEj7khdU02q8raXtgCbDV6be/cABjEfxqOSBpmsjCiWf2O/iYm5MTmHlX9VmklfK/DRD4rPwHn5R1K93Bai2lC8nlchhIEk25ioTXBw8eJgLJ98nbyh/R4TLYhQnI9/I= 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=lfxjgeLv; arc=none smtp.client-ip=209.85.222.172 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="lfxjgeLv" Received: by mail-qk1-f172.google.com with SMTP id af79cd13be357-7c554d7dc2aso129434085a.3 for ; Thu, 13 Mar 2025 05:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741867588; x=1742472388; 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=E3p062ai1AaXGIlqJv8w3IqJw84i5gPWV6oy5k5lnYA=; b=lfxjgeLvKObeZgFihWb0q52OYllBAKTdF/4lQ7HCrmU5Ign3Qf85EdNwKEnH5McfiQ RlOGZj7dQ1ZuTdkFMephTsFrTUBDna2WLKl6IDTAmvfn/RK9JbprpFJa+rWoeLFANhEz Tb1MnLvdy/4Ecf9myTEc4r7kOJLzSIkUWPGGY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741867588; x=1742472388; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E3p062ai1AaXGIlqJv8w3IqJw84i5gPWV6oy5k5lnYA=; b=MK//w4krJvgugc+TIJEBVjfEONbH9sUZenGC+7wR9F+m/cd6AamkXxWLkZuDUx7xCb 1MmNjUtMnBm95Dpk4cZ6CM25RaFy3wBNc3op0s5Sepf5aMZpTWvemfJCYzSFr0vVhMM8 A7zKC149kiTSk95G/55ZXhbiytBBP0/WnjkzadYXArfGM7jKOgQoOyI1cTj0Cs0aiBPO xoj+ZR6JW6sR6xd5oDNIBK7WVEZ1h/RzdEmDUrgTKVDVMXB+JGejRLC7s0gLTnTmAaOx Jofv1Uf8LZfXPWZBG+8n81EZSoTXoEJgqwLaTbRTa0JRsDFzzp8V1IDvfnz7rJHG4ctu pBPQ== X-Forwarded-Encrypted: i=1; AJvYcCXu/HR8FRPJiAEbQ29X5t2E9zWh46T/4nk/dS423CKmxQ37nxEMvidRk3PQRLj6Qm+niU9O2gNpv8gA1pQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwkT7Lw3FEeOy5RvbVvT10RJuh8/ri54sA+mK7rTWuzduGv02h3 StQksBCVE9EtHWnex1WJa9QWqNIUh/+pQDihHz2OjI2NDH/TT1/IKcoiXNzoOPQwqWB+BMBeoFo = X-Gm-Gg: ASbGncu7OKBL/Xa6Sj2PtSdfszHKcBBEGvF45D0U9sL61wgQJKLpFUa9xBvYHIlP9qA vii8F6PG1whrPVaBPxIuNMRfVjpY6Sd9E9SLXWIBu9q2MNVnyYSMchp6h5zpf1QOLSavr7Sn6pG oM++ugDpHx2Rr9cMWTit5PNHggbc68Fn4S2bI1DBgk6XQbIyvPDk8mCTI+onsbQggqjBPRAOxpp 61tMqTf+DlVd2m9dB9rhzzAU6lhi0Aqm7xB1g7kebZ71n5Uzsj8FmCwgZ6O8efhPk68MoXy9gaO dfWAipG7T3InHbyOr236lf3PiQKv5QRDglEyobnRkW0CXxrmI7FREGE9M57mW9b8B2shMzXQoVJ illABacLGUc/P+1AqaPCT3w== X-Google-Smtp-Source: AGHT+IEs1dnda/05lwv48p1kChP8H4iqWWWnIRWvPPrcVe+HE60b6DEE4FUAP4bsiwKGbIpAGianVA== X-Received: by 2002:a05:620a:8803:b0:7c5:5a97:f784 with SMTP id af79cd13be357-7c55a97f9fbmr1863851085a.33.1741867588213; Thu, 13 Mar 2025 05:06:28 -0700 (PDT) Received: from denia.c.googlers.com (15.237.245.35.bc.googleusercontent.com. [35.245.237.15]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c573c4db57sm92117685a.8.2025.03.13.05.06.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 05:06:27 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 13 Mar 2025 12:06:25 +0000 Subject: [PATCH v3 1/3] media: uvcvideo: Do not mark valid metadata as invalid 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: quoted-printable Message-Id: <20250313-uvc-metadata-v3-1-c467af869c60@chromium.org> References: <20250313-uvc-metadata-v3-0-c467af869c60@chromium.org> In-Reply-To: <20250313-uvc-metadata-v3-0-c467af869c60@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart , Hans de Goede , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , stable@vger.kernel.org X-Mailer: b4 0.14.2 Currently, the driver performs a length check of the metadata buffer before the actual metadata size is known and before the metadata is decided to be copied. This results in valid metadata buffers being incorrectly marked as invalid. Move the length check to occur after the metadata size is determined and is decided to be copied. Cc: stable@vger.kernel.org Fixes: 088ead255245 ("media: uvcvideo: Add a metadata device node") Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_video.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_= video.c index e3567aeb0007c1f0a766f331e4e744359e95a863..b113297dac61f1b2eecd72c36ea= 61ef2c1e7d28a 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1433,12 +1433,6 @@ static void uvc_video_decode_meta(struct uvc_streami= ng *stream, if (!meta_buf || length =3D=3D 2) return; =20 - if (meta_buf->length - meta_buf->bytesused < - length + sizeof(meta->ns) + sizeof(meta->sof)) { - meta_buf->error =3D 1; - return; - } - has_pts =3D mem[1] & UVC_STREAM_PTS; has_scr =3D mem[1] & UVC_STREAM_SCR; =20 @@ -1459,6 +1453,12 @@ static void uvc_video_decode_meta(struct uvc_streami= ng *stream, !memcmp(scr, stream->clock.last_scr, 6))) return; =20 + if (meta_buf->length - meta_buf->bytesused < + length + sizeof(meta->ns) + sizeof(meta->sof)) { + meta_buf->error =3D 1; + return; + } + meta =3D (struct uvc_meta_buf *)((u8 *)meta_buf->mem + meta_buf->bytesuse= d); local_irq_save(flags); time =3D uvc_video_get_time(); --=20 2.49.0.rc0.332.g42c0ae87b1-goog From nobody Thu Dec 18 06:53:21 2025 Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.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 EC916266F02 for ; Thu, 13 Mar 2025 12:06:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867592; cv=none; b=k8F5XPN1qTDP8P4d2D1A4QLP3t6QkJj112LDlseO2Sc8ZDfwrsZUFHNGaPhveFeFbWrPPv2An81k+oW+ajMAWk2+HW1qd55Pg4JB2soPetQCsOkqVjF7m7PlE7a+r21KCr4Z0cVJ7HX6tf8weO8wc/D/Y5EQP1bkKmdN2IiVe1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867592; c=relaxed/simple; bh=TGrzXI9YKQDJkjN7BUp5Wnd1Z6+rVPCgyfw/0NpdSaA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=V7dlY44kSdiOaxvhpMYBl+Q1JXvoWn7m7YwSqzisWTlXxQJDWiu8TfCuLtCDqehgw5zyRXIejpmPoz4wLY0wFB4fXByUkrX8NIvo7CBRCYWIdXsJAG59VoCCrCq13exLtOp9IxRAPi/QmoLlkRxwUfSL5AmFedrA4y+V8SgCcR4= 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=TtUwTCOb; arc=none smtp.client-ip=209.85.222.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="TtUwTCOb" Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-7c24ae82de4so81913685a.1 for ; Thu, 13 Mar 2025 05:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741867589; x=1742472389; 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=QVRqh3UaN3gOziVXPfdmS+tvyHN3C6l0olhTDl0Ea0I=; b=TtUwTCObajPMc534x698CzZdI9MrxAH2nDJaLQGQNgnialL+2hlCu/MtGzpaWCeyDk rys/6twkY52MAfOs1kqdD7Q0aOlbzycVPKYnNoepLx5ZgnxNl4Y5gveyYreoVACq3+a4 MKhvkvUaFbluXraugO3YQFUuGC/u5I5iq0gGU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741867589; x=1742472389; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QVRqh3UaN3gOziVXPfdmS+tvyHN3C6l0olhTDl0Ea0I=; b=u2j19D7Lzvy5E7Wgw+dFh960b+gQYsIuzHKcAGuXobnESGjcVAFVkFuvZYA2xaAfAE 8H1U+QDne7EyUhk86lQHRDK5pyJlmTFSk0xHRqkpnj46oeEq3W8aKbiObFEgqH6jAA/Z Rda9j5HDnTEPI/PDHliP/exaD3Y8DDgGsap+xQwMCjsin7mFMWopxF1TZq69O5CD2cQj evHqN6nXliY2cmkFXaLSV1qJ3Kr8/+LGnhdzlsK8Pr5FmyGd/HpHGhu0ZvTslFhfjs9T 6RlCsvnF8SBMRotpNi1szuXnfcL74WEkX4QTDwnkPNeX+CWVJmSPcoxBh3izZn8Aqsyj IRGw== X-Forwarded-Encrypted: i=1; AJvYcCU5FH0zVG/s7MZFl5GC7E/c88tnUjtZuMbpBCSf8M0dB9LJipfzM57Tu1SvDg9+mQpe/a9wu9MhcDSHClI=@vger.kernel.org X-Gm-Message-State: AOJu0YwSb3F59teDsyc+pDl0iawvXzErE6GHGN3sqB/3NBfgbLLKiKh6 0oLyPqnrSuSd9O21SzUQvfwkOkV60HiCBcR31VZ/HpeYrkLyEW/QhgxoPi+Hi0T1yhvxyu+RatM = X-Gm-Gg: ASbGncsIbJO04Di+okF8C/PLFWB94DjrSGkhCrPSbo5WglhMWOUgnyZzIVuHvSisIva tSmyVhXzQ/Isytp4Kdbhi2rgQeKynFy7tzq3ATMzMzsZS6NeXPDZbx4i/9PEBpW70/fDGvp5Hls OqAffvbZj86bTUamJ7RHi4FkBxDtaVd3f35p2Mi9H20r2EzfzetmXp7r/AbNo5Wdkb+ODj6xeUx Ta9Odvwbg0LJ5XnOf/vmRKI0IiNHLeqHRIwmda+zvuPhp/c3NIaoKt78ppkP3MWAP1+s0GDCMvp v4lgv8PfkSSlsaMByloksOqnP3ExfTx64+NkTQ3FiRDpaMgG8JaZs5HT395AxLyP/sZDx8lsTw2 0QBKrSTmJWihUWUF+bNivQQ== X-Google-Smtp-Source: AGHT+IEImbQ+B32WsIFxGlRX2mY8st8KTjcmYXJFgpAh8j9I46osYfnpEiMBC+CME+WXzL8jHZgt5Q== X-Received: by 2002:a05:620a:2b47:b0:7c5:4949:23ea with SMTP id af79cd13be357-7c55e968257mr2170930185a.47.1741867589598; Thu, 13 Mar 2025 05:06:29 -0700 (PDT) Received: from denia.c.googlers.com (15.237.245.35.bc.googleusercontent.com. [35.245.237.15]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c573c4db57sm92117685a.8.2025.03.13.05.06.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 05:06:29 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 13 Mar 2025 12:06:26 +0000 Subject: [PATCH v3 2/3] media: Documentation: Add note about UVCH length field 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: quoted-printable Message-Id: <20250313-uvc-metadata-v3-2-c467af869c60@chromium.org> References: <20250313-uvc-metadata-v3-0-c467af869c60@chromium.org> In-Reply-To: <20250313-uvc-metadata-v3-0-c467af869c60@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart , Hans de Goede , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 The documentation currently describes the UVC length field as the "length of the rest of the block", which can be misleading. The driver limits the data copied to a maximum of 12 bytes. This change adds a clarifying sentence to the documentation to make this restriction explicit. Signed-off-by: Ricardo Ribalda --- Documentation/userspace-api/media/v4l/metafmt-uvc.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/userspace-api/media/v4l/metafmt-uvc.rst b/Docume= ntation/userspace-api/media/v4l/metafmt-uvc.rst index 784346d14bbdbf28348262084d5b0646d30bd1da..42599875331c0066cf529153cac= cb731148023b9 100644 --- a/Documentation/userspace-api/media/v4l/metafmt-uvc.rst +++ b/Documentation/userspace-api/media/v4l/metafmt-uvc.rst @@ -44,7 +44,9 @@ Each individual block contains the following fields: them * - :cspan:`1` *The rest is an exact copy of the UVC payload header:* * - __u8 length; - - length of the rest of the block, including this field + - length of the rest of the block, including this field. Please note= that + regardless of the this value, for V4L2_META_FMT_UVC the kernel will + never copy more than 2-12 bytes. * - __u8 flags; - Flags, indicating presence of other standard UVC fields * - __u8 buf[]; --=20 2.49.0.rc0.332.g42c0ae87b1-goog From nobody Thu Dec 18 06:53:21 2025 Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.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 7DAFC26739D for ; Thu, 13 Mar 2025 12:06:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867594; cv=none; b=N3unQLXvgKnxBB+XfnVFfB9DBzRXdpMdRDsMiO7oQTrqpXQdRxxLX3/gaChISddxvef1lniKYHhAHIhysYgs9326Ob/lHCgE4g+anw7cyL+J63tUkIjdYons+yI85AJx3GHs+W6bko9wqi+lYk5pzgAbGMHbgh6mT/0tnnh1uJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867594; c=relaxed/simple; bh=29pelfkmcmoRIGGzeUx/Al0wDWrgyoW69zhwYaoLsnI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eM8ju2LJFU3JGWBMpdWr0IAEpOu48gEgZBkpBu47Qf50/jgHY/XiUc5KPdseOkuW7Ar3eilxJ6bAWy10/5jZ2IQKAUE8BmIa9Lu1Kc3jcqP+OTrKanPONb6qTPTUcPsBVYl3Hh3LFDbwTYy9JK8K+WDAvejEBRpP2wzrwsckG3U= 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=Awowln0p; arc=none smtp.client-ip=209.85.222.181 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="Awowln0p" Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-7be8f28172dso51445285a.3 for ; Thu, 13 Mar 2025 05:06:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741867591; x=1742472391; 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=uoMekbFYiURjA/Ma1CHI/wWtmP4OuAXoPIc+PxHPaU0=; b=Awowln0pcLe8sqlxpsgXU0xKki8KB4hj78pNOnBk44yd/61ft4KEy/t5uSx4h29dOy vaBAnyLhzBjrbu3TLbNulLJgJIpkeIp1AUB5V5lj1Gb1OujcRcD9HDwj7bwzR1Ru++Db tGY+1h2zdxVh7XkEoCqeaXICwJP8dbuvWKdIE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741867591; x=1742472391; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uoMekbFYiURjA/Ma1CHI/wWtmP4OuAXoPIc+PxHPaU0=; b=dyMo56IybpQaKsmmxpsvFjdAeVOcg+VhCuXKcOLVBcwWfZZsdycD76c2CMYjmuMXMJ tYv6mBF+2lnOhu2YuutWHDFHijjacqN7wXL0GTsy4SsN2WgKNqx5z9FJy4rRfGpJqZi1 M4AZkrag/KxLJMHut0x1LVM59wQJM+uTjbznvNdvTXK8a/4HfvkTmXTkYf7mwYOvhvmj qHH9MNJ4cAhmk892HftPi0J9PzNjTYATTbGvbynYTMfr+YoI191t8x7dzWdGN1syJcSv CeOUIRzZ3hnGQmc7EgqA5TNU5Z9FifTRSh5x6Tl236EMvbCII22R8Mmioy/nBIBLjjQC 2+Aw== X-Forwarded-Encrypted: i=1; AJvYcCVZWYRNBYjvad43Dz47ShKjyouNCVj26O6xVKjzQb8aZxJaZfVMCS1wW0jNrWyERak/lUgmSKRmMwuN12U=@vger.kernel.org X-Gm-Message-State: AOJu0YyB/dODteuFnO3xk8ZaTirOXCccBFubIM8WarGueiROYfaRKfmw rghgdK+i4i0nd3bOyME3o9cqtL3JMHlayxtcmJ+gHr9VfaMFgrEA0plJ0jsAXEL1RteVZTZ1P/Q u4A== X-Gm-Gg: ASbGncs7OlkQG3sjNrPsaWAMPpKczLb9OEyYZEZ6sJhqR2n+ghxRlSX0sN+8K4UDp6K wB9bx51p9OPQ8Ew0JczeKDPLl266mGoi8QdAKUUMezk0pYG4tSTJJRbquSUjiK7RCBC129t+ydg HnmAB3LNeQpa4Tbs8yl3OsqPiz5ZCjsza60Ih1R8TSPrxQOfFFGQkxFa1b76rMHtAVmUukkkZlT 4rgUVYRZyArr6W8H99vwGiqp42tPyhCh8xr97Lkcery+t5CYT0bbqIfZVMHJDRa0stOxPRNHHku xG15H77kGTmpiM969/YkHQ9x9nC8MuObOklte/VXXaV83GJn8B8tHZ30FiHBHUC1ilpJdTuYtBN wZ0DsyW7pAR+SnSjROdXQgA== X-Google-Smtp-Source: AGHT+IGTlig8kmYrtdA9vFKMK5hVn4z1GSGbEe1Xa8zAMYN41pWD/i7Dx4awPb0ofXtkDJoOxZfLag== X-Received: by 2002:a05:620a:6083:b0:7c5:6678:ab18 with SMTP id af79cd13be357-7c56678ae0emr1320035285a.42.1741867591068; Thu, 13 Mar 2025 05:06:31 -0700 (PDT) Received: from denia.c.googlers.com (15.237.245.35.bc.googleusercontent.com. [35.245.237.15]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c573c4db57sm92117685a.8.2025.03.13.05.06.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 05:06:29 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 13 Mar 2025 12:06:27 +0000 Subject: [PATCH v3 3/3] media: uvcvideo: Introduce V4L2_META_FMT_UVC_CUSTOM 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: quoted-printable Message-Id: <20250313-uvc-metadata-v3-3-c467af869c60@chromium.org> References: <20250313-uvc-metadata-v3-0-c467af869c60@chromium.org> In-Reply-To: <20250313-uvc-metadata-v3-0-c467af869c60@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart , Hans de Goede , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 The UVC driver provides two metadata types V4L2_META_FMT_UVC, and V4L2_META_FMT_D4XX. The only difference between the two of them is that V4L2_META_FMT_UVC only copies PTS, SCR, size and flags, and V4L2_META_FMT_D4XX copies the whole metadata section. Now we only enable V4L2_META_FMT_D4XX for the Intel D4xx family of devices, but it is useful to have the whole metadata section for any device where vendors include other metadata, such as the one described by Microsoft: https://learn.microsoft.com/en-us/windows-hardware/drivers/stream/mf-captur= e-metadata This patch introduces a new format V4L2_META_FMT_UVC_CUSTOM, that is identical to V4L2_META_FMT_D4XX but it is available to all the UVC devices. Suggested-by: Hans de Goede Signed-off-by: Ricardo Ribalda --- .../userspace-api/media/v4l/meta-formats.rst | 1 + .../userspace-api/media/v4l/metafmt-uvc-custom.rst | 31 +++++++++++++++++ MAINTAINERS | 1 + drivers/media/usb/uvc/uvc_metadata.c | 40 ++++++++++++++++++= ---- drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 1 + 6 files changed, 69 insertions(+), 6 deletions(-) diff --git a/Documentation/userspace-api/media/v4l/meta-formats.rst b/Docum= entation/userspace-api/media/v4l/meta-formats.rst index 86ffb3bc8ade2e0c563dd84441572ecea1a571a6..9fd83f4a3cc8509702a2a9f032f= dc04bf6c6d1bc 100644 --- a/Documentation/userspace-api/media/v4l/meta-formats.rst +++ b/Documentation/userspace-api/media/v4l/meta-formats.rst @@ -19,6 +19,7 @@ These formats are used for the :ref:`metadata` interface = only. metafmt-pisp-fe metafmt-rkisp1 metafmt-uvc + metafmt-uvc-custom metafmt-vivid metafmt-vsp1-hgo metafmt-vsp1-hgt diff --git a/Documentation/userspace-api/media/v4l/metafmt-uvc-custom.rst b= /Documentation/userspace-api/media/v4l/metafmt-uvc-custom.rst new file mode 100644 index 0000000000000000000000000000000000000000..9f150fc2b6f379cc4707ff45041= dd014956ae11a --- /dev/null +++ b/Documentation/userspace-api/media/v4l/metafmt-uvc-custom.rst @@ -0,0 +1,31 @@ +.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later + +.. _v4l2-meta-fmt-uvc-custom: + +********************************* +V4L2_META_FMT_UVC_CUSTOM ('UVCC') +********************************* + +UVC Custom Payload Metadata. + + +Description +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +V4L2_META_FMT_UVC_CUSTOM buffers follow the metadata buffer layout of +V4L2_META_FMT_UVC with the only difference that it includes all the UVC +metadata, not just the first 2-12 bytes. + +The most common metadata format is the one proposed by Microsoft(R)'s UVC +extension [1_], but other vendors might have different formats. + +Applications might use information from the Hardware Database (hwdb)[2_] to +process the camera's metadata accordingly. + +.. _1: + +[1] https://docs.microsoft.com/en-us/windows-hardware/drivers/stream/uvc-e= xtensions-1-5 + +.. _2: + +[2] https://www.freedesktop.org/software/systemd/man/latest/hwdb.html diff --git a/MAINTAINERS b/MAINTAINERS index 29b4471574982bf3f8d03158cd5edcb94bc9fab9..4e8e8096951ff0e7159d7f3916c= f7b014a6ef95f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -24665,6 +24665,7 @@ S: Maintained W: http://www.ideasonboard.org/uvc/ T: git git://linuxtv.org/media.git F: Documentation/userspace-api/media/drivers/uvcvideo.rst +F: Documentation/userspace-api/media/v4l/metafmt-uvc-custom.rst F: Documentation/userspace-api/media/v4l/metafmt-uvc.rst F: drivers/media/common/uvc.c F: drivers/media/usb/uvc/ diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/u= vc_metadata.c index 82de7781f5b6b70c5ba16bcba9e0741231231904..b257524d279a141f650e2fbb376= a35cc17252c2e 100644 --- a/drivers/media/usb/uvc/uvc_metadata.c +++ b/drivers/media/usb/uvc/uvc_metadata.c @@ -63,15 +63,21 @@ static int uvc_meta_v4l2_try_format(struct file *file, = void *fh, struct uvc_streaming *stream =3D video_get_drvdata(vfh->vdev); struct uvc_device *dev =3D stream->dev; struct v4l2_meta_format *fmt =3D &format->fmt.meta; - u32 fmeta =3D fmt->dataformat; + u32 fmeta; + + if (fmt->dataformat =3D=3D dev->info->meta_format) + fmeta =3D dev->info->meta_format; + else if (fmt->dataformat =3D=3D V4L2_META_FMT_UVC_CUSTOM) + fmeta =3D V4L2_META_FMT_UVC_CUSTOM; + else + fmeta =3D V4L2_META_FMT_UVC; =20 if (format->type !=3D vfh->vdev->queue->type) return -EINVAL; =20 memset(fmt, 0, sizeof(*fmt)); =20 - fmt->dataformat =3D fmeta =3D=3D dev->info->meta_format - ? fmeta : V4L2_META_FMT_UVC; + fmt->dataformat =3D fmeta; fmt->buffersize =3D UVC_METADATA_BUF_SIZE; =20 return 0; @@ -106,6 +112,24 @@ static int uvc_meta_v4l2_set_format(struct file *file,= void *fh, return ret; } =20 +static u32 uvc_meta_idx_to_fmeta(struct uvc_device *dev, u32 index) +{ + switch (index) { + case 0: + return V4L2_META_FMT_UVC; + case 1: + if (dev->info->meta_format) + return dev->info->meta_format; + return V4L2_META_FMT_UVC_CUSTOM; + case 2: + if (dev->info->meta_format) + return V4L2_META_FMT_UVC_CUSTOM; + return 0; + } + + return 0; +} + static int uvc_meta_v4l2_enum_formats(struct file *file, void *fh, struct v4l2_fmtdesc *fdesc) { @@ -113,16 +137,20 @@ static int uvc_meta_v4l2_enum_formats(struct file *fi= le, void *fh, struct uvc_streaming *stream =3D video_get_drvdata(vfh->vdev); struct uvc_device *dev =3D stream->dev; u32 index =3D fdesc->index; + u32 fmeta; + + if (fdesc->type !=3D vfh->vdev->queue->type) + return -EINVAL; =20 - if (fdesc->type !=3D vfh->vdev->queue->type || - index > 1U || (index && !dev->info->meta_format)) + fmeta =3D uvc_meta_idx_to_fmeta(dev, fdesc->index); + if (!fmeta) return -EINVAL; =20 memset(fdesc, 0, sizeof(*fdesc)); =20 fdesc->type =3D vfh->vdev->queue->type; fdesc->index =3D index; - fdesc->pixelformat =3D index ? dev->info->meta_format : V4L2_META_FMT_UVC; + fdesc->pixelformat =3D fmeta; =20 return 0; } diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core= /v4l2-ioctl.c index a16fb44c7246e35f3710306fde5dfc15329b4d95..1ffbf38823b226ff7044c798c4b= 982d52137e904 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1457,6 +1457,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_META_FMT_VSP1_HGO: descr =3D "R-Car VSP1 1-D Histogram"; break; case V4L2_META_FMT_VSP1_HGT: descr =3D "R-Car VSP1 2-D Histogram"; break; case V4L2_META_FMT_UVC: descr =3D "UVC Payload Header Metadata"; break; + case V4L2_META_FMT_UVC_CUSTOM: descr =3D "UVC Custom Payload Metadata"; b= reak; case V4L2_META_FMT_D4XX: descr =3D "Intel D4xx UVC Metadata"; break; case V4L2_META_FMT_VIVID: descr =3D "Vivid Metadata"; break; case V4L2_META_FMT_RK_ISP1_PARAMS: descr =3D "Rockchip ISP1 3A Parameters= "; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index c8cb2796130f8d1b864d669267d2b31f73b839aa..b0af18b7621296be0885d5b6549= 4ec01bc425c9c 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -851,6 +851,7 @@ struct v4l2_pix_format { #define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T') /* R-Car= VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H') /* UVC P= ayload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X') /* D4XX = Payload Header metadata */ +#define V4L2_META_FMT_UVC_CUSTOM v4l2_fourcc('U', 'V', 'C', 'C') /* UVC C= ustom Payload metadata */ #define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D') /* Vivid Met= adata */ =20 /* Vendor specific - used for RK_ISP1 camera sub-system */ --=20 2.49.0.rc0.332.g42c0ae87b1-goog