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 <[email protected]>
---
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
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 <[email protected]>
> ---
> 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);
> }
>
>
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 <[email protected]>
> ---
> 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
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 <[email protected]>
>> ---
>> 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
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 <[email protected]>
Cc: Hans Verkuil <[email protected]>
Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
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
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 <[email protected]>
> Cc: Hans Verkuil <[email protected]>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---
> 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 <[email protected]>
>
> 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
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 <[email protected]>
>> Cc: Hans Verkuil <[email protected]>
>> Signed-off-by: Gustavo A. R. Silva <[email protected]>
>> ---
>> 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 <[email protected]>
>
>>
>> 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
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 <[email protected]>
> Cc: Hans Verkuil <[email protected]>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---
> 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
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