From nobody Sun Feb 8 23:57:52 2026 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (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 5448D175D5D for ; Thu, 6 Mar 2025 15:51:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741276268; cv=none; b=gfVHc28xk1hBlvsRNWOjg5Vg+bvyWJG+vHWoWIQ8/x5GtGCyyJYZP6QV8AdKwKWEXxpRHze1kaGdzAOwkTREXnUZijfD7C8yAxamzpeJijqhN/YoJwvWlARXhDqURTMt/1B4NScUdNTq4nHi/AkLqLM4i+G2zIMknqOjoX2UnOo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741276268; c=relaxed/simple; bh=+tMzP8/U4KAu2Jedl6Pv/UjdmDc9hwAIH6ZLozGbNFY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=agI55xCfob9N6Ki6BJPbrnLbOfetvr2G0pxDRtzudMS8jPYdDmD744ZrM4iN8sOENa+3R14zR5kjfRCdPxvwjZm7AI2szLe0tFs+QK3a0E8NLnks+tIgdfxLO67OVudZHR9QcTBUmLx/IH/sHtjSl6DvU/J4WSkREvIncu0k6fI= 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=iRYskNbc; arc=none smtp.client-ip=209.85.222.170 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="iRYskNbc" Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-7c3cb761402so152992285a.0 for ; Thu, 06 Mar 2025 07:51:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741276265; x=1741881065; 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=tebyllIN/Zbv6qJSF1gFn0ztQoDPanzaNONkrFerC40=; b=iRYskNbcRb5aI0TOVuOq6zWSGMvzSGnD0QaL2TWHuKIAJL+xz6N//zG+mqimioU/TG hPl5WyWBZ4/aMjPsQuEVqBufF2zfy9BX6qrp8INHNgY1Ozkpwq1QipfaEcs3dnQi+4RZ V/chydMSFMXjadsCMi0sJ+FY3tJkG4qA9rU8o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741276265; x=1741881065; 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=tebyllIN/Zbv6qJSF1gFn0ztQoDPanzaNONkrFerC40=; b=dTuBA2Mv8yRxqrnNX/nusfxdWfn7rIdRk6VejhxFdhef9qFyDxvQTaSiTSWV+iBdI5 ELryO5tcIyj7s664nYhG5RDtgNWrXwpZfDV+drvDS8tS+27SoBSbxDSTLR48rCkuTI60 i3luhpiaOrs3/vUlpDLhEjw69pqp1Hs1bjHmPgRKk3if2vrvkS6ynGACCD6RGsGC98L9 cWM3olDp5vwfPyv7oz7cetCV/Yjj8+5g7ZMmoPAmxkDdRP9qmPb2bO8ayAilfrwtkxpT cG+zpoVLfaDwQZg46YgHuM9n5FA/T+4hRuNyfX9zqnW+n2BUdxGRnEE/nJDe63trrF9g SXKg== X-Forwarded-Encrypted: i=1; AJvYcCUUKN/awdN82QiivFErN7oQfRfPbDQNqWZSWLElcRuyKt5wd6PgYvqMPIbphg4y+R4ZDiv6BD8Jnj1GItY=@vger.kernel.org X-Gm-Message-State: AOJu0YxRsaagVtij5cCKxbglwOELwe7otjFgoxHTYLVEq9UlijQ+PXE3 /ayEQqj9CnoYx/FeUmKebDcz5Nri1PQeJxF8KEe7OfjKE6AccQENIXjq3smj0w== X-Gm-Gg: ASbGncv49OtIQAjfVjHOofURCwJN0RDbGvTnF0MNNMtdCWniC2uhMtjs0gU5eIfHjLL OiUSF8hbOloA5Q9T34VNmIaFzGlumWnuPwEy3rD17+w1MPkE2UTRo+KrpWQ/Lp3/JAMnCc7eIP5 ClVMeDxODiUHK93b4H/rwlvZcCW4QXAnvJPPQswudPjObAae9qLNZkXDz8sf8p/FYGP3w/DpSRZ wV/HFLD97EguGWt/Xab7cZ9+D0BvCdLxb3ixzsqLxg3mIz83ZKB0sZoeM716MPc12Gss82XsEas evEAiYP35WdhuIDWN+Ya6taNf9iUrGw09PAWM3k8XnndwbgLBjPSdoCLw0YQSacRCON2NoSvJkc k7AadtAeRQ+sFz5hw3Ua0jg== X-Google-Smtp-Source: AGHT+IH5bWdUn9V+inAAYzX1nFsPFrQPywd00cBMWhKVgBRcwkroYe3aZ88m81OT1RfDwLpdZdOW6A== X-Received: by 2002:a05:620a:84c8:b0:7c3:d07f:12c5 with SMTP id af79cd13be357-7c3d8e97042mr1392961385a.53.1741276265252; Thu, 06 Mar 2025 07:51:05 -0800 (PST) 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-7c3e533a1a1sm106257585a.6.2025.03.06.07.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 07:51:04 -0800 (PST) From: Ricardo Ribalda Date: Thu, 06 Mar 2025 15:51:01 +0000 Subject: [PATCH v2 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: <20250306-uvc-metadata-v2-1-7e939857cad5@chromium.org> References: <20250306-uvc-metadata-v2-0-7e939857cad5@chromium.org> In-Reply-To: <20250306-uvc-metadata-v2-0-7e939857cad5@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.48.1.711.g2feabab25a-goog From nobody Sun Feb 8 23:57:52 2026 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (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 6CC9620E715 for ; Thu, 6 Mar 2025 15:51:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741276268; cv=none; b=W3HUw0WLD1CoX/5dd8Z83e+norkxyymhmL3k0KarMB+nzMlXCLkVJuttGPFfMpgww/d4ZpS16hvbJKmhgFpwuyhEj+kjYkSi2h3hRSo5TLV4F4L/6GJpX4/qKGSr0oYt1Jb4iNlkCff6DWPbjP/E59jRzrGjAaT+31BxZC0gNHo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741276268; c=relaxed/simple; bh=5mF3yhDyZ984uk7RoubZ8XpqAlVSm925HnRSq7bds3U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b6QQBT03xXjfnlgzdsojtuYujfb2tIRcOIKF2i9QePpIPxvW6JeA4PH8wljk1WhLWm5sZyORCO0yV1XoG93r4yId5u0hAmq1aKyfOG7xWks//916DhMBTUgZ/j/U435y+nW8AfgXUCcTSBsPOFMaZsqpNWfbp2l2iY4yXXiVS8M= 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=WVDUjOpP; arc=none smtp.client-ip=209.85.222.176 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="WVDUjOpP" Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-7c3d9cdb0ccso160712485a.3 for ; Thu, 06 Mar 2025 07:51:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741276266; x=1741881066; 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=UsSa+JKj39pPYtX0boTlbPBxfwuId0RpTAo3OqB6/1I=; b=WVDUjOpPVh5KRC0KgWjNjz0yWUGdPHhkjfbsVvYKQMo1+rqxJmyVZZjw38XSHGRDCw B7lawyk6dQVpLqBqvRtPPJxy4Ud1dg1ebVd8pi/8vkgUCE/wMf0/4uFfPBrsCnfBYUze GRyf9XoLbrTGNCQYYKJ1e+px+3Exo2dJX4Pq4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741276266; x=1741881066; 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=UsSa+JKj39pPYtX0boTlbPBxfwuId0RpTAo3OqB6/1I=; b=D4Ow+ihIqEsEHpweto+HrKPFHSnZuO0fBk7Nnuj801cNP0KlMwe3N6l1/JmYU9I3if F4uv7beWeaesz7UB1fqsSWTWNPvUx7cyXfSv6jJ0+BbLwKlU8Eif4AuCWMKrah7FSSJb JHCeXTsx1Dvmn8gVQH20tTphNX3Ogx9QIYUCrdTvoPFIcNw9xvQzc4k9JadRDExFWM4b PvvOYWQ36oG4wazEe8SCrPZs7jee3G7/x+xDO7h64KEm7X5256wYU7N4/EWrFq/+TOTn zkVSjFh4EUMKbn7rUQphNGC3nccYgd34x2EhwOzOxK238L7tPN5wFIxrUahIHZfYwy+5 uAzg== X-Forwarded-Encrypted: i=1; AJvYcCVVVtloySKrkF4SkBVlDP9bY1OF5jrw19y28wQnYMpBmJQth29nHYH5u8EbfaPZVNDpwOUuH6oxYUb3kBw=@vger.kernel.org X-Gm-Message-State: AOJu0YzaYuTzso5JtbHuUIds3tijxVSgjLJ+FJbqxLoODByxoR9Dqu2F Lpduk1E7JHvx+9v4HTjnhtK7HoeHkubBJEGE9vM0zwjwHtOeEW3GwLJfebAiEA== X-Gm-Gg: ASbGncsE3SpBBF3wGgAGt3Ix8+aGRSxVYIzt6AR72ajyb+GOh5E8MXz9SrfvE4Zg/sY o0ESs59SDJlWsHYWX06BB4bObb0SfpfwYVkFMLOl940vq45gmfaBD/f+R8cu1sUO4VZ9D5a/j8s b3BSnTgyn/Gd/KGSAA9pkJhKj/WDiA17TGC4MeC+gGeixJ7t+aasfKfJs4FMWDkDZ9hapIh4XXl pWfZZIedwL7fW8ZxFnIREOkPKXY12jPW5lsW8F2PXvASRrsXXZ2emyFj0xTORQL/a6RGVHFEWFq S2oRhCrpEiP/5Xn1M+BoKaZ/8uMKoWrZjHpDx4G+U/KTQBoKBIntiof+lL75u1UimRQWwt2r7K6 oCbuNJ8hItwwz5dd1peNVpw== X-Google-Smtp-Source: AGHT+IGaPRp7BfTuXVNq9ubOX42+gm3iaTgGnD/JJ/jx8dRs5bQKTPSsb/pvVPIVVzCwTG0KQvOkSg== X-Received: by 2002:a05:620a:2813:b0:7c3:d266:334f with SMTP id af79cd13be357-7c3d8e797b7mr1109333085a.38.1741276266339; Thu, 06 Mar 2025 07:51:06 -0800 (PST) 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-7c3e533a1a1sm106257585a.6.2025.03.06.07.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 07:51:05 -0800 (PST) From: Ricardo Ribalda Date: Thu, 06 Mar 2025 15:51:02 +0000 Subject: [PATCH v2 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: <20250306-uvc-metadata-v2-2-7e939857cad5@chromium.org> References: <20250306-uvc-metadata-v2-0-7e939857cad5@chromium.org> In-Reply-To: <20250306-uvc-metadata-v2-0-7e939857cad5@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.48.1.711.g2feabab25a-goog From nobody Sun Feb 8 23:57:52 2026 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 E62B821129A for ; Thu, 6 Mar 2025 15:51:08 +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=1741276270; cv=none; b=O9o1HpWwv7kh8lUlZkgKYYbl5kzTdijBrRC/5KX7ABAOqUwsDDEZo7kg63TEM1J/AuNizrsr/pSFEC7iV2imuytPVpLZMjQcxDBtC0nk41PDEQGAjKZixDTykvOyVgnWb87cbkXUBk8faH11/zKcvdPo66PW+Z+VtZXkCNhnLLg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741276270; c=relaxed/simple; bh=sIWjSP//bax9MQTRChAEaQyMFPvhzadmJr8ZnrvUJTw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Lq013beoeCwrutz2i6LC/HQ4Hd8pMGMv1/qy/GL72Cl4KxViQtSzTvg499JqzAzJ/RV/IqSv9/SpGl8oxLSnx2a0IqsDKJIV6loSh5qMRFYAhsG4HBuHLo8qmvLNpM2291dj2wZ4Ts4PuAAzqgtYPLDlLcQ8hX4KUERtqbdVbMA= 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=fprApgwN; 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="fprApgwN" Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-7c0155af484so119144985a.0 for ; Thu, 06 Mar 2025 07:51:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741276268; x=1741881068; 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=r8GfSnj+zIIgfn2ux5Vg/9U83zEPCtOOrWat8WfZMlE=; b=fprApgwNzHk621IKcNnWeclqWhLy973E9WqMN8ZxHgsb/h6NV3iVWtMDzE/gmgDOtR +TOoUkQRG7Ar3ldifSd+KeaZdIwfF1GHDK85TF9KMgOrRGkFKPZA6yVFdTWuQjtooFfO yPKOC0oJcmfuGRd3XxsDxexXDc0v78GaKbWPk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741276268; x=1741881068; 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=r8GfSnj+zIIgfn2ux5Vg/9U83zEPCtOOrWat8WfZMlE=; b=o9MxFv/r58ZPXLClgS7kJMzEal7CwULDUDdXU3bL3zAGDR4bQ1CelxriVo4S+9jD6C V5KL7mCpM0KZnzCHfvnY/NFePUcLErIK7hZPrXj1fkyFrYpGybfvb+WLEZPyip9gcbRA LCgOoxpxA0SmX8FeDRqWZEIQlpE/70dChlR4HkSMz1xeuCJJVk5VmoUpReB9SmSadGgB AgGqete3xaBb8p8e+3kxFCIpS8TaR1NgD2zXj2BMesD5LJhrEycGWQ2LZtLM2gvOdXh0 wZsuA8UMd+rbC/UGh3i36wadMfQCamd1H1vCoiPfiqdKN/oo/qmUMvWplgnCsVKWWMpJ cYJQ== X-Forwarded-Encrypted: i=1; AJvYcCWcyTqWfYnEwzKadmJUHdeOpNX+3B3FJrob6j/0ZBWGappzCjr98BY+xYJLZS+iTy45fXE3++vNIozhSJE=@vger.kernel.org X-Gm-Message-State: AOJu0YyqS4XsQqpvEBb0jc//w1P5VlNqk8Bcwt+5k1WF844c8K1D7JLJ 8+ESNwXTN5kPEcwajYoaUBPbEoKQl32EuJ8l2LEl5DV6dq5aEafULdT35Chhyw== X-Gm-Gg: ASbGncseY0wQbA8/xH/z1WOOUaVhyjZhT6RTf3Ph+NlP0nBeGgEEIY4ATZnmlqN6TQ2 eRtcJygszqWbGC7piVIDIoB9QnQ96XfqcJYeiyJxTIPhloDifxGJHyD8AAYwIJFLbmjfMLxuNgT 3evq98heVRzT0YoIrCJrryADey63jmI6Ty52ROcMW7pEKFEkUnbzI7wRWJrONyaoGvhjbe5TJNF Ox+mCusSefWF0wCG7Hr3A32d75lCXOjE3k7Kh/lpUfp7+xUn4PPzLAxpYHfyDxnaHUArCFse584 2HkmU9hn0sAdxUJfbD4diTl8xiHKq8F6z0wWA3AVNY5xup4MgHl3OnG58hxqJvGjSnDPJ71ltaA dbnw63kGT0Sv2/jmhci5YKA== X-Google-Smtp-Source: AGHT+IEYBvMSEWNHJ/1hj3bKCOo7ajfk5v8Aot3cuzewpOwzNsY/phoYuzG1+uzlcwgpVuTa35TRzg== X-Received: by 2002:a05:620a:8bc4:b0:7c3:d862:dfe1 with SMTP id af79cd13be357-7c3d8ed325dmr910967585a.51.1741276267703; Thu, 06 Mar 2025 07:51:07 -0800 (PST) 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-7c3e533a1a1sm106257585a.6.2025.03.06.07.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 07:51:07 -0800 (PST) From: Ricardo Ribalda Date: Thu, 06 Mar 2025 15:51:03 +0000 Subject: [PATCH v2 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: <20250306-uvc-metadata-v2-3-7e939857cad5@chromium.org> References: <20250306-uvc-metadata-v2-0-7e939857cad5@chromium.org> In-Reply-To: <20250306-uvc-metadata-v2-0-7e939857cad5@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 | 30 ++++++++++++++++ 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, 68 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..bec197cad65b52902c950c158c1= 25dc17189c1d4 --- /dev/null +++ b/Documentation/userspace-api/media/v4l/metafmt-uvc-custom.rst @@ -0,0 +1,30 @@ +.. 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.48.1.711.g2feabab25a-goog