From patchwork Thu Mar 6 15:51:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 14004741 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 045FB1991A4 for ; Thu, 6 Mar 2025 15:51:06 +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=1741276269; cv=none; b=DwZ13J+Ko5Xa4PZegOPbY98xiQAAM0Sy8o2fsAVX1ThjmAoo0XIHasqwCT37gEwuymPS9JYy8GrRG1zSN2tXHVs74Xu5C/xZ1deNJ1B7nD4xuy1hTVZQ3KWDxtHcQtoreH1vTf6ZE2h9hC+AnUfk3qXj06qOjrrhKnUvKZ606+M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741276269; c=relaxed/simple; bh=+tMzP8/U4KAu2Jedl6Pv/UjdmDc9hwAIH6ZLozGbNFY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LYC+txYwqhjyyXaIOoA6oILPMSmmstn88Dt4K/0r+8kM8g6ng/pkQE539aG93EUqEE+Lf4OuDDlvU7SVh0hdpmmubCENTdr5wAZHroyGP620uvAPXPORAYtzYouOQqOL5p3pWH7hKqF+G21AL5h5ejFAOfy3MjcP6evCmFiS/xQ= 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.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="iRYskNbc" Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-7c3d9cdb0ccso160711085a.3 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=Kp4pM+2c5HXDMJn8xSXQbvvvH+XywKLTFeEJv/8slWcyAm6/vPDV8mkbSda+jDY2AT ha97Hfb2mKr3+/h1BL35yaVUfc9CEe/4biT25mide3Ho+T036e28duqneSWsb2E8ZMnK 9LdEoYNFX4HI8dbqwD9JdDssuka9DfJPh3vP4WyroqzGLl/KelcbJh3PPWBly3eJlZdW 2CmDnd/3yhDRNPCnjSn+AO07AGGcm2JJ2FArLgKS3mG0FqJIDM49BsibZ51iomjl/MDo QULBbmFXles8PXqXYKEBpn3zuruqMywxZWDyEp4pwtLLtnjPHGESRlCjcPY1OWiWZI1r Vr9g== X-Gm-Message-State: AOJu0YzNdf5EIcILpxtvylIS8E336BuGR8Zwj5QUofwQJH2GEWr/oGw5 peDSN9PeDzupbJdp30uP2IF4fT+0CvHd3aukSnDf6vVAYuRSqdzG32MgB4vSJzCs9V/XOGy+IhE = X-Gm-Gg: ASbGncuk+UI1jG1vmrZJHhO48fbSJ3Oc+BWINbyUS6TdEZ/xKr3L6oDGbDtPKjsu9J7 DTIn63FF3b5u/qa3hxdW8M9858ppA7wH/3G7NfmOqQAznb0E/rMx3kmM23MFD6EmgTLX6J0dWqd gRcV+3wIS0oqwHCp0SnefK4TkOx7jSpXYrpBJn/ICT5a8ABPhU9lbMYvfCYcTslpt0KDPq7gX6I 20ylMRuFeZMPlJzwRptbfllyNUcdD7nArxjHzftB1hDXgRkCHswT+J2Bby/Iouo6zzl+QRzaJ6i 0CmvAvnJzoS2/vu4ic53AunCjbEudD2dV/WQucB840iRUwOzcQ8pGx6W5GUO03Kc5paKRm7AzW6 /ksECxoUCWw2ig52Djw6B8Q== 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-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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..b113297dac61f1b2eecd72c36ea61ef2c1e7d28a 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_streaming *stream, if (!meta_buf || length == 2) return; - if (meta_buf->length - meta_buf->bytesused < - length + sizeof(meta->ns) + sizeof(meta->sof)) { - meta_buf->error = 1; - return; - } - has_pts = mem[1] & UVC_STREAM_PTS; has_scr = mem[1] & UVC_STREAM_SCR; @@ -1459,6 +1453,12 @@ static void uvc_video_decode_meta(struct uvc_streaming *stream, !memcmp(scr, stream->clock.last_scr, 6))) return; + if (meta_buf->length - meta_buf->bytesused < + length + sizeof(meta->ns) + sizeof(meta->sof)) { + meta_buf->error = 1; + return; + } + meta = (struct uvc_meta_buf *)((u8 *)meta_buf->mem + meta_buf->bytesused); local_irq_save(flags); time = uvc_video_get_time(); From patchwork Thu Mar 6 15:51:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 14004740 Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (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 AE63920F071 for ; Thu, 6 Mar 2025 15:51:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741276269; cv=none; b=kr0r8LuKEVAhd/Zm6ybpMAi3C6DWqg8Keh9GbHMZcvqKTgsDEDIG6Hg55T/6+9IVVlCA0GqgDkk7327Whja08lU8Fg1bAfEqQkLBZWn5GBD8ZpsLAJjy7xSWp0ubhc5UzBUluV5KuTBzKAhVyRrT+p9yJuLPq4+YDby8rqBR6h8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741276269; c=relaxed/simple; bh=5mF3yhDyZ984uk7RoubZ8XpqAlVSm925HnRSq7bds3U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hoeZVlA+A5gZl/6isGlfBuNcjyubf6g2DgBTq50EZZY9qLaasX7uthqe3knq99608n5+GdSEJH1rdNH43N1x6NwJqpl1yETA29zeHYChwzWL5CS0gu8DCZ37p6FaOcuPgI6a8IA0RYAplOlKvp2KJcucG6t4s1kduZTAwbKy4bY= 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.179 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-f179.google.com with SMTP id af79cd13be357-7c3cb761402so152998585a.0 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=RuF/GzNsVuYK4tZLCla/QNz7dF0ZZvCddnirvQbvHGwBDS1ERoPJZ1G4UysVRhoLb2 RdJRAwJVMMe5NSkG/a0uAxYW7C9LnBUfHVFEYAUJhx9IuF7RDsnv7SIi/VVQbJSFO2E8 0KxRPDBtfZNskoZaNIG87hJZyYG61AinYZvrcPhoGchkKIy03y+hGwieMr1+R4GK2rT8 v5Zlg7iOXtwAwJZmDB0M7LcnUauqraGS2RcF2Qn7z0LucRdMAfWrboD/cDM6PMPVu068 Dq52XOCfS4xxuodmUvUYeQB+jialb5Tkj+U0GbFHbc22enrMJMHHB8S5wkn1dQ71Ow/X Mm4Q== X-Gm-Message-State: AOJu0YyRXQRJbZXdhdwWgJBt2MPQ2ury805c5WefjsfTUB6+J+pMa1wd iEhABGiWFe0XftjKDgiu04hSgngSPUy9k63VNRDpACvhZzqZ00EnEFElx0kdBGhwvrYAz/8YbEo = X-Gm-Gg: ASbGncukG2qcvA+Kj5Dk4dBQwA9TSQln3W5sQewcf+brd3XZsTQZ+lE1v+ZoRBsmtIX qOS07Sbsrb3DfAP0IYo9ZLRqG8sVQBRji2WizR1tZE52A5mXu/jBuFJrO2X6VOj1V508hkR9Kro wIQM49kmfUPufY00teKGNhtoe52KZrbA4pLWjSFiLVv5pmOd7HNhYpVcUahUcprJgeJPaD+BU4q rm7pv4KEIMVg64Trz6PLVIjOwg5TJjK1ACYUYSR8vs6NztemZLAbJIRh2Sguvr+bc71Bq/sVuDe x8R3Xai+q43w4JhzsaAVmdhqdocmgd62+696vTCDA39Y1WjhX/VmzqgS4zq04Ol25frKJrdEgAi t/ZXlyTaYVZJ4zYfaelYkog== 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-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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/Documentation/userspace-api/media/v4l/metafmt-uvc.rst index 784346d14bbdbf28348262084d5b0646d30bd1da..42599875331c0066cf529153caccb731148023b9 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[]; From patchwork Thu Mar 6 15:51:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 14004742 Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (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 12BC9211479 for ; Thu, 6 Mar 2025 15:51:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741276270; cv=none; b=QRnObxkI9BPyf4xWduCxRBiVbWS8GC5u8iVCO08A4hq91W88vO9bJqE/VFUQ3n/POZ3GEOBZD1KCGpY652Dz1Czjkq/yb7eq/JUl2NPuQ5/TK/2exReLkgkVofCoiBnVLuBMA16gIuVNmYM72nNJbP4INPLpSJZPVDHW6QsbmDk= 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.177 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-f177.google.com with SMTP id af79cd13be357-7c081915cf3so106905185a.1 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=uRv5VealYnDA6yszuMiFh81Ypba77cbX/Iboze2mTCDDHD8eY57/OrEUlEn95KAwuP DDhqcrUlJd8Wp3Wjywu3/5rRGbX4Xzmwv6vUtjnNiZj68nrBwP6e4qt4bxJe/RzHBQKu hvqfvmTiFdggR83mda8KR/cH48v8kCNFYQGZKtvR2Z7WApNv3DYAm5Qve4inMktax/HI B9ITG4Ap0Uk17LlJ/n++/tRvl0NkDhdsHUDmP9hLvon552J/SzKMJzoqAUyRFdJW0SHy rOazGvc2osvTxXLRMtdlyqLstOHz9b1J4JOWnR3iYOtyC+zKxuqhfbrhfOk0eOvf2H4N DzBg== X-Gm-Message-State: AOJu0Yycvf611dJ1Ks1YAksix1obz6ScmakWETkXc/5NIJ5Ot/J6n/rf 1ycw8mOma0imBGHNtZ9Cvo9FzGSssukznNq7s0hYdZYnkbTTw2/CNmt5AknrneYRQfSUuVOSVJ4 = X-Gm-Gg: ASbGncugA7dVnXZWQRx6v5abnS4jwa1f1E6aOPyW3lkz1aHuF8YwPdqYB8MHiNXN96l UlnGOfquNb1sM8epWZW+kWPKzUh9QBd3jFuDnFT8zlWrUBZPjudp81vp7b5MTN5MSczKtxvHEy9 V77eyS/OZ6BRHZOy67jk8n2zjlW/XRa48R2++mqQLZQfgH+39e/fsmmhWTlTqIG8V3OB7XefTBG 9W4McriyNDYgMXetq65I234gcNG7jukC4QFwaEss1CEMCwd9Bm2z8zFGtgy3ntg+uSd0r1NvM26 GyBgftoJE1RFmaLaTDV8hvBIiKsuRbuRsjULAWnunVQC8bDOy8ihBdNrGFz49g5rQ/d0YATXyzP GEB18/uyH5uPJv5satqHFJQ== 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-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-capture-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/Documentation/userspace-api/media/v4l/meta-formats.rst index 86ffb3bc8ade2e0c563dd84441572ecea1a571a6..9fd83f4a3cc8509702a2a9f032fdc04bf6c6d1bc 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..bec197cad65b52902c950c158c125dc17189c1d4 --- /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 +=========== + +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-extensions-1-5 + +.. _2: +[2] https://www.freedesktop.org/software/systemd/man/latest/hwdb.html diff --git a/MAINTAINERS b/MAINTAINERS index 29b4471574982bf3f8d03158cd5edcb94bc9fab9..4e8e8096951ff0e7159d7f3916cf7b014a6ef95f 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/uvc_metadata.c index 82de7781f5b6b70c5ba16bcba9e0741231231904..b257524d279a141f650e2fbb376a35cc17252c2e 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 = video_get_drvdata(vfh->vdev); struct uvc_device *dev = stream->dev; struct v4l2_meta_format *fmt = &format->fmt.meta; - u32 fmeta = fmt->dataformat; + u32 fmeta; + + if (fmt->dataformat == dev->info->meta_format) + fmeta = dev->info->meta_format; + else if (fmt->dataformat == V4L2_META_FMT_UVC_CUSTOM) + fmeta = V4L2_META_FMT_UVC_CUSTOM; + else + fmeta = V4L2_META_FMT_UVC; if (format->type != vfh->vdev->queue->type) return -EINVAL; memset(fmt, 0, sizeof(*fmt)); - fmt->dataformat = fmeta == dev->info->meta_format - ? fmeta : V4L2_META_FMT_UVC; + fmt->dataformat = fmeta; fmt->buffersize = UVC_METADATA_BUF_SIZE; return 0; @@ -106,6 +112,24 @@ static int uvc_meta_v4l2_set_format(struct file *file, void *fh, return ret; } +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 *file, void *fh, struct uvc_streaming *stream = video_get_drvdata(vfh->vdev); struct uvc_device *dev = stream->dev; u32 index = fdesc->index; + u32 fmeta; + + if (fdesc->type != vfh->vdev->queue->type) + return -EINVAL; - if (fdesc->type != vfh->vdev->queue->type || - index > 1U || (index && !dev->info->meta_format)) + fmeta = uvc_meta_idx_to_fmeta(dev, fdesc->index); + if (!fmeta) return -EINVAL; memset(fdesc, 0, sizeof(*fdesc)); fdesc->type = vfh->vdev->queue->type; fdesc->index = index; - fdesc->pixelformat = index ? dev->info->meta_format : V4L2_META_FMT_UVC; + fdesc->pixelformat = fmeta; return 0; } diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index a16fb44c7246e35f3710306fde5dfc15329b4d95..1ffbf38823b226ff7044c798c4b982d52137e904 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 = "R-Car VSP1 1-D Histogram"; break; case V4L2_META_FMT_VSP1_HGT: descr = "R-Car VSP1 2-D Histogram"; break; case V4L2_META_FMT_UVC: descr = "UVC Payload Header Metadata"; break; + case V4L2_META_FMT_UVC_CUSTOM: descr = "UVC Custom Payload Metadata"; break; case V4L2_META_FMT_D4XX: descr = "Intel D4xx UVC Metadata"; break; case V4L2_META_FMT_VIVID: descr = "Vivid Metadata"; break; case V4L2_META_FMT_RK_ISP1_PARAMS: descr = "Rockchip ISP1 3A Parameters"; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index c8cb2796130f8d1b864d669267d2b31f73b839aa..b0af18b7621296be0885d5b65494ec01bc425c9c 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 Payload 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 Custom Payload metadata */ #define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D') /* Vivid Metadata */ /* Vendor specific - used for RK_ISP1 camera sub-system */