* [PATCH] media: venus: fix duplicated code for different branches
@ 2017-08-17 23:12 Gustavo A. R. Silva
2017-08-18 6:57 ` Hans Verkuil
2017-08-18 7:52 ` Stanimir Varbanov
0 siblings, 2 replies; 9+ messages in thread
From: Gustavo A. R. Silva @ 2017-08-17 23:12 UTC (permalink / raw)
To: Stanimir Varbanov, Mauro Carvalho Chehab
Cc: linux-media, linux-arm-msm, linux-kernel, Gustavo A. R. Silva
Refactor code in order to avoid identical code for different branches.
This issue was detected with the help of Coccinelle.
Addresses-Coverity-ID: 1415317
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
This code was reported by Coverity and it was tested by compilation only.
Please, verify if this is an actual bug.
drivers/media/platform/qcom/venus/helpers.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
index 5f4434c..8a5c467 100644
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -240,11 +240,7 @@ static void return_buf_error(struct venus_inst *inst,
{
struct v4l2_m2m_ctx *m2m_ctx = inst->m2m_ctx;
- if (vbuf->vb2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
- v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
- else
- v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
-
+ v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
}
--
2.5.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] media: venus: fix duplicated code for different branches
2017-08-17 23:12 [PATCH] media: venus: fix duplicated code for different branches Gustavo A. R. Silva
@ 2017-08-18 6:57 ` Hans Verkuil
2017-08-18 7:52 ` Stanimir Varbanov
1 sibling, 0 replies; 9+ messages in thread
From: Hans Verkuil @ 2017-08-18 6:57 UTC (permalink / raw)
To: Gustavo A. R. Silva, Stanimir Varbanov, Mauro Carvalho Chehab
Cc: linux-media, linux-arm-msm, linux-kernel
Stanimir, please review this! I suspect that this is the wrong fix and
that the first v4l2_m2m_src_buf_remove_by_buf should be
v4l2_m2m_dst_buf_remove_by_buf instead.
Regards,
Hans
On 08/18/2017 01:12 AM, Gustavo A. R. Silva wrote:
> Refactor code in order to avoid identical code for different branches.
>
> This issue was detected with the help of Coccinelle.
>
> Addresses-Coverity-ID: 1415317
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> ---
> This code was reported by Coverity and it was tested by compilation only.
> Please, verify if this is an actual bug.
>
> drivers/media/platform/qcom/venus/helpers.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
> index 5f4434c..8a5c467 100644
> --- a/drivers/media/platform/qcom/venus/helpers.c
> +++ b/drivers/media/platform/qcom/venus/helpers.c
> @@ -240,11 +240,7 @@ static void return_buf_error(struct venus_inst *inst,
> {
> struct v4l2_m2m_ctx *m2m_ctx = inst->m2m_ctx;
>
> - if (vbuf->vb2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
> - v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
> - else
> - v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
> -
> + v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
> v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
> }
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] media: venus: fix duplicated code for different branches
2017-08-17 23:12 [PATCH] media: venus: fix duplicated code for different branches Gustavo A. R. Silva
2017-08-18 6:57 ` Hans Verkuil
@ 2017-08-18 7:52 ` Stanimir Varbanov
2017-08-18 15:55 ` Gustavo A. R. Silva
1 sibling, 1 reply; 9+ messages in thread
From: Stanimir Varbanov @ 2017-08-18 7:52 UTC (permalink / raw)
To: Gustavo A. R. Silva, Mauro Carvalho Chehab
Cc: linux-media, linux-arm-msm, linux-kernel
Hi Gustavo,
On 08/18/2017 02:12 AM, Gustavo A. R. Silva wrote:
> Refactor code in order to avoid identical code for different branches.
>
> This issue was detected with the help of Coccinelle.
>
> Addresses-Coverity-ID: 1415317
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> ---
> This code was reported by Coverity and it was tested by compilation only.
> Please, verify if this is an actual bug.
Yes looks like copy/paste error, and yes it is a bug.
>
> drivers/media/platform/qcom/venus/helpers.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
> index 5f4434c..8a5c467 100644
> --- a/drivers/media/platform/qcom/venus/helpers.c
> +++ b/drivers/media/platform/qcom/venus/helpers.c
> @@ -240,11 +240,7 @@ static void return_buf_error(struct venus_inst *inst,
> {
> struct v4l2_m2m_ctx *m2m_ctx = inst->m2m_ctx;
>
> - if (vbuf->vb2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
> - v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
> - else
> - v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
the correct fix must replace the second v4l2_m2m_src_* with v4l2_m2m_dst_*.
> -
> + v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
> v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
> }
>
>
--
regards,
Stan
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] media: venus: fix duplicated code for different branches
2017-08-18 7:52 ` Stanimir Varbanov
@ 2017-08-18 15:55 ` Gustavo A. R. Silva
2017-08-18 16:07 ` [PATCH v2] venus: fix copy/paste error in return_buf_error Gustavo A. R. Silva
0 siblings, 1 reply; 9+ messages in thread
From: Gustavo A. R. Silva @ 2017-08-18 15:55 UTC (permalink / raw)
To: Stanimir Varbanov, Mauro Carvalho Chehab
Cc: linux-media, linux-arm-msm, linux-kernel
Hi Stanimir,
On 08/18/2017 02:52 AM, Stanimir Varbanov wrote:
> Hi Gustavo,
>
> On 08/18/2017 02:12 AM, Gustavo A. R. Silva wrote:
>> Refactor code in order to avoid identical code for different branches.
>>
>> This issue was detected with the help of Coccinelle.
>>
>> Addresses-Coverity-ID: 1415317
>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
>> ---
>> This code was reported by Coverity and it was tested by compilation only.
>> Please, verify if this is an actual bug.
>
> Yes looks like copy/paste error, and yes it is a bug.
>
Thank you for reviewing it.
>>
>> drivers/media/platform/qcom/venus/helpers.c | 6 +-----
>> 1 file changed, 1 insertion(+), 5 deletions(-)
>>
>> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
>> index 5f4434c..8a5c467 100644
>> --- a/drivers/media/platform/qcom/venus/helpers.c
>> +++ b/drivers/media/platform/qcom/venus/helpers.c
>> @@ -240,11 +240,7 @@ static void return_buf_error(struct venus_inst *inst,
>> {
>> struct v4l2_m2m_ctx *m2m_ctx = inst->m2m_ctx;
>>
>> - if (vbuf->vb2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
>> - v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
>> - else
>> - v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
>
> the correct fix must replace the second v4l2_m2m_src_* with v4l2_m2m_dst_*.
>
I'll send a patch to fix this bug shortly
>> -
>> + v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
>> v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
>> }
>>
>>
>
Thanks!
--
Gustavo A. R. Silva
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2] venus: fix copy/paste error in return_buf_error
2017-08-18 15:55 ` Gustavo A. R. Silva
@ 2017-08-18 16:07 ` Gustavo A. R. Silva
2017-08-21 9:14 ` Stanimir Varbanov
2017-08-23 12:59 ` Stanimir Varbanov
0 siblings, 2 replies; 9+ messages in thread
From: Gustavo A. R. Silva @ 2017-08-18 16:07 UTC (permalink / raw)
To: Stanimir Varbanov, Hans Verkuil, Mauro Carvalho Chehab
Cc: linux-media, linux-arm-msm, linux-kernel, Gustavo A. R. Silva
Call function v4l2_m2m_dst_buf_remove_by_buf() instead of
v4l2_m2m_src_buf_remove_by_buf()
Addresses-Coverity-ID: 1415317
Cc: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
Changes in v2:
Stanimir Varbanov confirmed this is a bug. The correct fix is to call
function v4l2_m2m_dst_buf_remove_by_buf instead of function
v4l2_m2m_src_buf_remove_by_buf in the _else_ branch.
drivers/media/platform/qcom/venus/helpers.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
index 5f4434c..2d61879 100644
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -243,7 +243,7 @@ static void return_buf_error(struct venus_inst *inst,
if (vbuf->vb2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
else
- v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
+ v4l2_m2m_dst_buf_remove_by_buf(m2m_ctx, vbuf);
v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
}
--
2.5.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2] venus: fix copy/paste error in return_buf_error
2017-08-18 16:07 ` [PATCH v2] venus: fix copy/paste error in return_buf_error Gustavo A. R. Silva
@ 2017-08-21 9:14 ` Stanimir Varbanov
2017-08-22 19:22 ` Gustavo A. R. Silva
2017-08-23 12:59 ` Stanimir Varbanov
1 sibling, 1 reply; 9+ messages in thread
From: Stanimir Varbanov @ 2017-08-21 9:14 UTC (permalink / raw)
To: Gustavo A. R. Silva, Stanimir Varbanov, Hans Verkuil,
Mauro Carvalho Chehab
Cc: linux-media, linux-arm-msm, linux-kernel
Thanks Gustavo!
On 08/18/2017 07:07 PM, Gustavo A. R. Silva wrote:
> Call function v4l2_m2m_dst_buf_remove_by_buf() instead of
> v4l2_m2m_src_buf_remove_by_buf()
>
> Addresses-Coverity-ID: 1415317
> Cc: Stanimir Varbanov <stanimir.varbanov@linaro.org>
> Cc: Hans Verkuil <hverkuil@xs4all.nl>
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> ---
> Changes in v2:
> Stanimir Varbanov confirmed this is a bug. The correct fix is to call
> function v4l2_m2m_dst_buf_remove_by_buf instead of function
> v4l2_m2m_src_buf_remove_by_buf in the _else_ branch.
>
> drivers/media/platform/qcom/venus/helpers.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Acked-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
>
> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
> index 5f4434c..2d61879 100644
> --- a/drivers/media/platform/qcom/venus/helpers.c
> +++ b/drivers/media/platform/qcom/venus/helpers.c
> @@ -243,7 +243,7 @@ static void return_buf_error(struct venus_inst *inst,
> if (vbuf->vb2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
> v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
> else
> - v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
> + v4l2_m2m_dst_buf_remove_by_buf(m2m_ctx, vbuf);
>
> v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
> }
>
--
regards,
Stan
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] venus: fix copy/paste error in return_buf_error
2017-08-21 9:14 ` Stanimir Varbanov
@ 2017-08-22 19:22 ` Gustavo A. R. Silva
0 siblings, 0 replies; 9+ messages in thread
From: Gustavo A. R. Silva @ 2017-08-22 19:22 UTC (permalink / raw)
To: Stanimir Varbanov, Stanimir Varbanov, Hans Verkuil,
Mauro Carvalho Chehab
Cc: linux-media, linux-arm-msm, linux-kernel
On 08/21/2017 04:14 AM, Stanimir Varbanov wrote:
> Thanks Gustavo!
>
Glad to help. :)
> On 08/18/2017 07:07 PM, Gustavo A. R. Silva wrote:
>> Call function v4l2_m2m_dst_buf_remove_by_buf() instead of
>> v4l2_m2m_src_buf_remove_by_buf()
>>
>> Addresses-Coverity-ID: 1415317
>> Cc: Stanimir Varbanov <stanimir.varbanov@linaro.org>
>> Cc: Hans Verkuil <hverkuil@xs4all.nl>
>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
>> ---
>> Changes in v2:
>> Stanimir Varbanov confirmed this is a bug. The correct fix is to call
>> function v4l2_m2m_dst_buf_remove_by_buf instead of function
>> v4l2_m2m_src_buf_remove_by_buf in the _else_ branch.
>>
>> drivers/media/platform/qcom/venus/helpers.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Acked-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
>
>>
>> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
>> index 5f4434c..2d61879 100644
>> --- a/drivers/media/platform/qcom/venus/helpers.c
>> +++ b/drivers/media/platform/qcom/venus/helpers.c
>> @@ -243,7 +243,7 @@ static void return_buf_error(struct venus_inst *inst,
>> if (vbuf->vb2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
>> v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
>> else
>> - v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
>> + v4l2_m2m_dst_buf_remove_by_buf(m2m_ctx, vbuf);
>>
>> v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
>> }
>>
>
--
Gustavo A. R. Silva
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] venus: fix copy/paste error in return_buf_error
2017-08-18 16:07 ` [PATCH v2] venus: fix copy/paste error in return_buf_error Gustavo A. R. Silva
2017-08-21 9:14 ` Stanimir Varbanov
@ 2017-08-23 12:59 ` Stanimir Varbanov
2017-08-23 15:14 ` Stanimir Varbanov
1 sibling, 1 reply; 9+ messages in thread
From: Stanimir Varbanov @ 2017-08-23 12:59 UTC (permalink / raw)
To: Gustavo A. R. Silva, Stanimir Varbanov, Hans Verkuil,
Mauro Carvalho Chehab
Cc: linux-media, linux-arm-msm, linux-kernel
Gustavo,
could you resend the patch with the Acked-by and Cc stable kernel.
On 08/18/2017 07:07 PM, Gustavo A. R. Silva wrote:
> Call function v4l2_m2m_dst_buf_remove_by_buf() instead of
> v4l2_m2m_src_buf_remove_by_buf()
>
> Addresses-Coverity-ID: 1415317
> Cc: Stanimir Varbanov <stanimir.varbanov@linaro.org>
> Cc: Hans Verkuil <hverkuil@xs4all.nl>
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> ---
> Changes in v2:
> Stanimir Varbanov confirmed this is a bug. The correct fix is to call
> function v4l2_m2m_dst_buf_remove_by_buf instead of function
> v4l2_m2m_src_buf_remove_by_buf in the _else_ branch.
>
> drivers/media/platform/qcom/venus/helpers.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
> index 5f4434c..2d61879 100644
> --- a/drivers/media/platform/qcom/venus/helpers.c
> +++ b/drivers/media/platform/qcom/venus/helpers.c
> @@ -243,7 +243,7 @@ static void return_buf_error(struct venus_inst *inst,
> if (vbuf->vb2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
> v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
> else
> - v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf);
> + v4l2_m2m_dst_buf_remove_by_buf(m2m_ctx, vbuf);
>
> v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
> }
>
--
regards,
Stan
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] venus: fix copy/paste error in return_buf_error
2017-08-23 12:59 ` Stanimir Varbanov
@ 2017-08-23 15:14 ` Stanimir Varbanov
0 siblings, 0 replies; 9+ messages in thread
From: Stanimir Varbanov @ 2017-08-23 15:14 UTC (permalink / raw)
To: Stanimir Varbanov, Gustavo A. R. Silva, Hans Verkuil,
Mauro Carvalho Chehab
Cc: linux-media, linux-arm-msm, linux-kernel
On 08/23/2017 03:59 PM, Stanimir Varbanov wrote:
> Gustavo,
>
> could you resend the patch with the Acked-by and Cc stable kernel.
No need to resend, sorry for the noise.
--
regards,
Stan
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-08-23 15:15 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-17 23:12 [PATCH] media: venus: fix duplicated code for different branches Gustavo A. R. Silva
2017-08-18 6:57 ` Hans Verkuil
2017-08-18 7:52 ` Stanimir Varbanov
2017-08-18 15:55 ` Gustavo A. R. Silva
2017-08-18 16:07 ` [PATCH v2] venus: fix copy/paste error in return_buf_error Gustavo A. R. Silva
2017-08-21 9:14 ` Stanimir Varbanov
2017-08-22 19:22 ` Gustavo A. R. Silva
2017-08-23 12:59 ` Stanimir Varbanov
2017-08-23 15:14 ` Stanimir Varbanov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox