* [PATCH] media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE condition @ 2024-05-17 9:49 Nas Chung 2024-05-17 10:10 ` Sebastian Fricke 2024-05-22 7:54 ` Michael Tretter 0 siblings, 2 replies; 5+ messages in thread From: Nas Chung @ 2024-05-17 9:49 UTC (permalink / raw) To: mchehab, linux-media; +Cc: linux-kernel, Nas Chung We expect V4L2_TYPE_IS_CAPTURE() macro allow only CAPTURE type. But, Inverting OUTPUT type can allow undefined v4l2_buf_type. Check CAPTURE type directly instead of inverting OUTPUT type. Signed-off-by: Nas Chung <nas.chung@chipsnmedia.com> --- include/uapi/linux/videodev2.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index fe6b67e83751..32b10e2b7695 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -171,7 +171,13 @@ 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) \ + ((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE \ + || (type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE \ + || (type) == V4L2_BUF_TYPE_VBI_CAPTURE \ + || (type) == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE \ + || (type) == V4L2_BUF_TYPE_SDR_CAPTURE \ + || (type) == V4L2_BUF_TYPE_META_CAPTURE) enum v4l2_tuner_type { V4L2_TUNER_RADIO = 1, -- 2.25.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE condition 2024-05-17 9:49 [PATCH] media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE condition Nas Chung @ 2024-05-17 10:10 ` Sebastian Fricke 2024-05-17 12:33 ` Nas Chung 2024-05-22 7:54 ` Michael Tretter 1 sibling, 1 reply; 5+ messages in thread From: Sebastian Fricke @ 2024-05-17 10:10 UTC (permalink / raw) To: Nas Chung; +Cc: mchehab, linux-media, linux-kernel Hey Nas, thanks for the patch, I think making the macro more explicit is generally a good idea, but in this case all !OUTPUT are actually CAPTURE types (besides the one deprecated type) and when I look at the definitions of some of the set commands like S_FMT, I can see that they require a type as parameter. So, could you explain in the commit message, how it can happen that the buf_type is undefined? And if so maybe that case should be fixed instead? I have improved your commit message below, but please explain why this is needed, e.g. which case did you hit where you found an undefined buffer. On 17.05.2024 18:49, Nas Chung wrote: >We expect V4L2_TYPE_IS_CAPTURE() macro allow only CAPTURE type. >But, Inverting OUTPUT type can allow undefined v4l2_buf_type. >Check CAPTURE type directly instead of inverting OUTPUT type. My suggestion for this commit message: """ Explicitly compare the type of the buffer with the available CAPTURE buffer types, to avoid matching a buffer type outside of the valid buffer type set. """ Basically fixing the sentence structure and grammar and focusing more on the reason of your action instead of describing what the code does (which should hopefully be obvious in most cases) I hope that helps :) Regards, Sebastian > >Signed-off-by: Nas Chung <nas.chung@chipsnmedia.com> >--- > include/uapi/linux/videodev2.h | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > >diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h >index fe6b67e83751..32b10e2b7695 100644 >--- a/include/uapi/linux/videodev2.h >+++ b/include/uapi/linux/videodev2.h >@@ -171,7 +171,13 @@ 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) \ >+ ((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE \ >+ || (type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE \ >+ || (type) == V4L2_BUF_TYPE_VBI_CAPTURE \ >+ || (type) == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE \ >+ || (type) == V4L2_BUF_TYPE_SDR_CAPTURE \ >+ || (type) == V4L2_BUF_TYPE_META_CAPTURE) > > enum v4l2_tuner_type { > V4L2_TUNER_RADIO = 1, >-- >2.25.1 > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH] media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE condition 2024-05-17 10:10 ` Sebastian Fricke @ 2024-05-17 12:33 ` Nas Chung 0 siblings, 0 replies; 5+ messages in thread From: Nas Chung @ 2024-05-17 12:33 UTC (permalink / raw) To: Sebastian Fricke Cc: mchehab@kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Hi, Sebastian. Thanks for the prompt reply. >-----Original Message----- >From: Sebastian Fricke <sebastian.fricke@collabora.com> >Sent: Friday, May 17, 2024 7:10 PM >To: Nas Chung <nas.chung@chipsnmedia.com> >Cc: mchehab@kernel.org; linux-media@vger.kernel.org; linux- >kernel@vger.kernel.org >Subject: Re: [PATCH] media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE >condition > >Hey Nas, > >thanks for the patch, I think making the macro more explicit is >generally a good idea, but in this case all !OUTPUT are actually CAPTURE >types (besides the one deprecated type) and when I look at the >definitions of some of the set commands like S_FMT, I can see that they >require a type as parameter. >So, could you explain in the commit message, how it can happen that the >buf_type is undefined? And if so maybe that case should be fixed >instead? v4l2-compliance test G_SELECTION ioctl with invalid buffer type. testBasicSelection() { // Check handling of invalid type. sel.type = 0xff; fail_on_test(doioctl(node, VIDIOC_G_SELECTION, &sel) != EINVAL); // Check handling of invalid target. } In v4l2 driver, I'm trying to replace IF clause for buffer type checking to helper macro. But, If I use V4L2_TYPE_IS_CAPTURE in g_selection() ioctl_ops function, It cannot pass the above test case. And, Buffer type is set by host. We cannot ensure host always set valid buffer type. So, I think we can prevent any potential bugs. Or checking valid buffer type in v4l_g_selection() is another option. >I have improved your commit message below, but please explain why this >is needed, e.g. which case did you hit where you found an undefined >buffer. > >On 17.05.2024 18:49, Nas Chung wrote: >>We expect V4L2_TYPE_IS_CAPTURE() macro allow only CAPTURE type. >>But, Inverting OUTPUT type can allow undefined v4l2_buf_type. >>Check CAPTURE type directly instead of inverting OUTPUT type. > >My suggestion for this commit message: > >""" >Explicitly compare the type of the buffer with the available CAPTURE >buffer types, to avoid matching a buffer type outside of the valid >buffer type set. >""" Much better! Thanks. Thanks. Nas. > >Basically fixing the sentence structure and grammar and focusing more on >the reason of your action instead of describing what the code does >(which should hopefully be obvious in most cases) > >I hope that helps :) > >Regards, >Sebastian > >> >>Signed-off-by: Nas Chung <nas.chung@chipsnmedia.com> >>--- >> include/uapi/linux/videodev2.h | 8 +++++++- >> 1 file changed, 7 insertions(+), 1 deletion(-) >> >>diff --git a/include/uapi/linux/videodev2.h >b/include/uapi/linux/videodev2.h >>index fe6b67e83751..32b10e2b7695 100644 >>--- a/include/uapi/linux/videodev2.h >>+++ b/include/uapi/linux/videodev2.h >>@@ -171,7 +171,13 @@ 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) \ >>+ ((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE \ >>+ || (type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE \ >>+ || (type) == V4L2_BUF_TYPE_VBI_CAPTURE \ >>+ || (type) == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE \ >>+ || (type) == V4L2_BUF_TYPE_SDR_CAPTURE \ >>+ || (type) == V4L2_BUF_TYPE_META_CAPTURE) >> >> enum v4l2_tuner_type { >> V4L2_TUNER_RADIO = 1, >>-- >>2.25.1 >> >> ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE condition 2024-05-17 9:49 [PATCH] media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE condition Nas Chung 2024-05-17 10:10 ` Sebastian Fricke @ 2024-05-22 7:54 ` Michael Tretter 2024-05-23 1:48 ` Nas Chung 1 sibling, 1 reply; 5+ messages in thread From: Michael Tretter @ 2024-05-22 7:54 UTC (permalink / raw) To: Nas Chung; +Cc: mchehab, linux-media, linux-kernel, Sebastian Fricke On Fri, 17 May 2024 18:49:40 +0900, Nas Chung wrote: > We expect V4L2_TYPE_IS_CAPTURE() macro allow only CAPTURE type. > But, Inverting OUTPUT type can allow undefined v4l2_buf_type. > Check CAPTURE type directly instead of inverting OUTPUT type. > > Signed-off-by: Nas Chung <nas.chung@chipsnmedia.com> > --- > include/uapi/linux/videodev2.h | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h > index fe6b67e83751..32b10e2b7695 100644 > --- a/include/uapi/linux/videodev2.h > +++ b/include/uapi/linux/videodev2.h > @@ -171,7 +171,13 @@ 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) \ > + ((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE \ > + || (type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE \ > + || (type) == V4L2_BUF_TYPE_VBI_CAPTURE \ > + || (type) == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE \ > + || (type) == V4L2_BUF_TYPE_SDR_CAPTURE \ > + || (type) == V4L2_BUF_TYPE_META_CAPTURE) Maybe adding a V4L2_TYPE_IS_VALID(type) macro would be helpful to define TYPE_IS_CAPTURE as all valid types that are not OUTPUT: #define V4L2_TYPE_IS_VALID(type) \ ((type) >= V4L2_BUF_TYPE_VIDEO_CAPTURE \ && (type) <= V4L2_BUF_TYPE_META_OUTPUT) #define V4L2_TYPE_IS_CAPTURE(type) \ (V4L2_TYPE_IS_VALID(type) && !V4L2_TYPE_IS_OUTPUT(type)) This would avoid keeping the two explicit lists of OUTPUT and CAPTURE types. Michael > > enum v4l2_tuner_type { > V4L2_TUNER_RADIO = 1, > -- > 2.25.1 > > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH] media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE condition 2024-05-22 7:54 ` Michael Tretter @ 2024-05-23 1:48 ` Nas Chung 0 siblings, 0 replies; 5+ messages in thread From: Nas Chung @ 2024-05-23 1:48 UTC (permalink / raw) To: Michael Tretter Cc: mchehab@kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Fricke Hi, Michael. Thank you for the feedback. >-----Original Message----- >From: Michael Tretter <m.tretter@pengutronix.de> >Sent: Wednesday, May 22, 2024 4:55 PM >To: Nas Chung <nas.chung@chipsnmedia.com> >Cc: mchehab@kernel.org; linux-media@vger.kernel.org; linux- >kernel@vger.kernel.org; Sebastian Fricke <sebastian.fricke@collabora.com> >Subject: Re: [PATCH] media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE >condition > >On Fri, 17 May 2024 18:49:40 +0900, Nas Chung wrote: >> We expect V4L2_TYPE_IS_CAPTURE() macro allow only CAPTURE type. >> But, Inverting OUTPUT type can allow undefined v4l2_buf_type. >> Check CAPTURE type directly instead of inverting OUTPUT type. >> >> Signed-off-by: Nas Chung <nas.chung@chipsnmedia.com> >> --- >> include/uapi/linux/videodev2.h | 8 +++++++- >> 1 file changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/include/uapi/linux/videodev2.h >b/include/uapi/linux/videodev2.h >> index fe6b67e83751..32b10e2b7695 100644 >> --- a/include/uapi/linux/videodev2.h >> +++ b/include/uapi/linux/videodev2.h >> @@ -171,7 +171,13 @@ 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) \ >> + ((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE \ >> + || (type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE \ >> + || (type) == V4L2_BUF_TYPE_VBI_CAPTURE \ >> + || (type) == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE \ >> + || (type) == V4L2_BUF_TYPE_SDR_CAPTURE \ >> + || (type) == V4L2_BUF_TYPE_META_CAPTURE) > >Maybe adding a V4L2_TYPE_IS_VALID(type) macro would be helpful to define >TYPE_IS_CAPTURE as all valid types that are not OUTPUT: > > #define V4L2_TYPE_IS_VALID(type) \ > ((type) >= V4L2_BUF_TYPE_VIDEO_CAPTURE \ > && (type) <= V4L2_BUF_TYPE_META_OUTPUT) > > #define V4L2_TYPE_IS_CAPTURE(type) \ > (V4L2_TYPE_IS_VALID(type) && !V4L2_TYPE_IS_OUTPUT(type)) > >This would avoid keeping the two explicit lists of OUTPUT and CAPTURE >types. I agree that it's better to add a V4L2_TYPE_IS_VALID(type) macro. I will address this in V2. Thanks. Nas. > >Michael > >> >> enum v4l2_tuner_type { >> V4L2_TUNER_RADIO = 1, >> -- >> 2.25.1 >> >> >> ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-05-23 1:48 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-05-17 9:49 [PATCH] media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE condition Nas Chung 2024-05-17 10:10 ` Sebastian Fricke 2024-05-17 12:33 ` Nas Chung 2024-05-22 7:54 ` Michael Tretter 2024-05-23 1:48 ` Nas Chung
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox