Received-SPF: pass (google.com: domain of linux-kernel+bounces-200046-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Nas Chung <nas.chung@chipsnmedia.com>
To: mchehab@kernel.org,
	hverkuil@xs4all.nl,
	bryan.odonoghue@linaro.org,
	linux-media@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
	Nas Chung <nas.chung@chipsnmedia.com>,
	Michael Tretter <m.tretter@pengutronix.de>
Subject: [PATCH v3 1/3] media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE condition
Date: Tue,  4 Jun 2024 14:11:18 +0900
Message-Id: <20240604051120.9441-1-nas.chung@chipsnmedia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?zY7PKxnEyNIVSOfeQ5xnQYiKZDBFYLwohsu1Ni3/j303xf46XyYzmyewSpSP?=
 =?us-ascii?Q?26vyhdnCFaxk5jO2olFQnWBCQypfbn2f9d3JfVHt9EEQ0uEtFbbSXwnCwUxg?=
 =?us-ascii?Q?7iftd4jjSnUN9w4bgvYmrASSp0xSBD3WrfvLu3GLHhx7o/nkXf8JhgQRB9mF?=
 =?us-ascii?Q?UebX2gj5T83xUSZGe4WIkM/6ldiLtOPIEnJfXa4GeFQVnVfNYSVkTLTYSvRs?=
 =?us-ascii?Q?onVOkPl4D+dOGyaGnix1YO5JnEDs3vRELlsVzAuk7JUq6sedEScBdx4J9k8s?=
 =?us-ascii?Q?U1Fg3f89iw4dRITBQdvFbmxApL9/q5t3H1c6QSqPPN+bCp7xAlyaxB3USLen?=
 =?us-ascii?Q?s6b38aJGYngWWKDbfi7eLi7jylE8Xsp3vK85Fw5hLn8S9US7KgU6pSG+fUHj?=
 =?us-ascii?Q?EHoQXJVHErV0uySMHaPd4WC8mug6BDq4pxIHXZFEVtiX6SX3cnPG9Exn9PrV?=
 =?us-ascii?Q?K5XRvyH/7722FCcl9VIXvT4YJahqLQ8dtTh+1mzEfEN0Z2kJ/1U5bVoEaKbf?=
 =?us-ascii?Q?8V62+WW5l13vBE8IxDPRyBsq1iknGugFpBMSyDaq5d8ile5Odkm0oxpXQf1w?=
 =?us-ascii?Q?67zEmj9U8u9IynTGUvjNV+yxcnyeQ7Ib97ogxeF/NkGH/vmK2AJhAxmmQBzE?=
 =?us-ascii?Q?oBo8ttgcnkX4Mf14ndsw8SeaWAFS4xuu0kpLHLCGyMI2wcIdPB3Pa35cQVz+?=
 =?us-ascii?Q?ZNWbBNQCaa0B0cuz08/UZgNoEM2mqVXRUoPFJCclMoCwvIGpluAEtB2zdKcU?=
 =?us-ascii?Q?9RXPlVvcnDDqV5mis6KEvJyCo1qWfuv/VaV12al7CttCDaUj+UgOUo28HQoP?=
 =?us-ascii?Q?afmUDvbr8ReDEf+Eg/u0S/zqu6WsFqpGDoIcvXc6Mi0ZcPOmvT65ppI9lcmG?=
 =?us-ascii?Q?Psapjexloe+Wo5GY0dDAQl+Y9oRYXe6PlHDE4/r1GFikNJytDx0240VwwxWm?=
 =?us-ascii?Q?0ELX+xVTYypTUOAqb5VJf2lo6sjalkhCEttNB0A6nfvsuSOuGCskzygRJQWI?=
 =?us-ascii?Q?4C/MBUBRwGTGrlMvXU5gK7KW9e7Y/WWU8IMPI3G779Vhn9QyTkveH5/vws6S?=
 =?us-ascii?Q?bP8HcdYFQIBMg6a5bUDwqzAPoFqRop4BOeYXDCACNV80HXO0j/Ynf4w/VZ9H?=
 =?us-ascii?Q?oeTtMzhTs7NtYThk8jQDJtedZPC5P7JRye51zW5NTDq7DMCajxh1cuM5w1WR?=
 =?us-ascii?Q?NqQdyckyLtVQBWUKnP2sGsMTgX7eCqOTMQxNpA1pV8uuu3uvFw1lFNrVtGgO?=
 =?us-ascii?Q?t8r0PrqogIBfpEU0xMJIMvUyNLwqJHc+rjEQN3D34moJvClK8+1yJgmWo8qC?=
 =?us-ascii?Q?ez/r4oPgmuAMpLQV4adLaBAlPqo8EuNBl1qWBbIEeNYNUBdyi3WbDt4R4SNe?=
 =?us-ascii?Q?4t0wB3k2TmPuthdyfEcajDxN4GfFUf/1jgzF5aQiBZTzPkIre04Yis7A5OY6?=
 =?us-ascii?Q?Inh7bqpfRxlnwk/8iI72y+G1lsH/3gNT5LE76SRQ7h1Vi27r2AwR1ASvTVfs?=
 =?us-ascii?Q?yvFxBkNp+YeU0wvoIBlslxaSxfiJAXGWuTG1Q0A3niQ4TPfdUQB2u5mGtthL?=
 =?us-ascii?Q?3StLcC3QIPxfGCUVk9AFpN0toxJZ6FYdd869YjnqQrZvISPA74PvDI+e6Q0K?=
 =?us-ascii?Q?Ow=3D=3D?=
X-OriginatorOrg: chipsnmedia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 422e6d6f-6303-4fd0-a96c-08dc8454cf60
X-MS-Exchange-CrossTenant-AuthSource: SL2P216MB1246.KORP216.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 05:11:37.2333
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4d70c8e9-142b-4389-b7f2-fa8a3c68c467
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: WnKv7SQFALFlk/4H9gzA/DtJqrzrGAoNRTPRWz6lmO2u+Ku4xz11zR6e9oj8mia8E14ubX6o7Ib4zE9FCMTUxS9o2mN5FkBLgXlgjILa0ME=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SE2P216MB1537

Explicitly compare a buffer type only with valid buffer types,
to avoid matching a buffer type outside of the valid buffer type set.

Signed-off-by: Nas Chung <nas.chung@chipsnmedia.com>
Reviewed-by: Michael Tretter <m.tretter@pengutronix.de>
---
v3
- Address Han's feedback

v2
- Improve commit message
- Add V4L2_TYPE_IS_VALID(type) macro

 include/uapi/linux/videodev2.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index fe6b67e83751..51da63173a98 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -153,10 +153,17 @@ enum v4l2_buf_type {
 	V4L2_BUF_TYPE_SDR_OUTPUT           = 12,
 	V4L2_BUF_TYPE_META_CAPTURE         = 13,
 	V4L2_BUF_TYPE_META_OUTPUT	   = 14,
+	/*  V4L2_TYPE_IS_VALID and V4L2_TYPE_IS_OUTPUT must
+	 *  be updated if a new type is added.
+	 */
 	/* Deprecated, do not use */
 	V4L2_BUF_TYPE_PRIVATE              = 0x80,
 };
 
+#define V4L2_TYPE_IS_VALID(type)		\
+	((type) >= V4L2_BUF_TYPE_VIDEO_CAPTURE	\
+	 && (type) <= V4L2_BUF_TYPE_META_OUTPUT)
+
 #define V4L2_TYPE_IS_MULTIPLANAR(type)			\
 	((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE	\
 	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
@@ -171,7 +178,8 @@ enum v4l2_buf_type {
 	 || (type) == V4L2_BUF_TYPE_SDR_OUTPUT			\
 	 || (type) == V4L2_BUF_TYPE_META_OUTPUT)
 
-#define V4L2_TYPE_IS_CAPTURE(type) (!V4L2_TYPE_IS_OUTPUT(type))
+#define V4L2_TYPE_IS_CAPTURE(type)	\
+	(V4L2_TYPE_IS_VALID(type) && !V4L2_TYPE_IS_OUTPUT(type))
 
 enum v4l2_tuner_type {
 	V4L2_TUNER_RADIO	     = 1,
-- 
2.25.1