linux-kernel - Re: [PATCH] media: v4l2-mem2mem: Fix hold buf flag check

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <4fe0c972-cfd7-e04b-17dc-e739e4c8fc00@xs4all.nl>
Date:   Tue, 5 Nov 2019 10:57:14 +0100
From:   Hans Verkuil <hverkuil-cisco@...all.nl>
To:     Jernej Skrabec <jernej.skrabec@...l.net>,
        mchehab+samsung@...nel.org
Cc:     linux-media@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] media: v4l2-mem2mem: Fix hold buf flag check

On 10/28/19 7:57 PM, Jernej Skrabec wrote:
> Hold buf flag is set on output queue, not capture. Fix that.
> 
> Fixes: f07602ac3887 ("media: v4l2-mem2mem: add new_frame detection")
> Signed-off-by: Jernej Skrabec <jernej.skrabec@...l.net>
> ---
>  drivers/media/v4l2-core/v4l2-mem2mem.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
> index db07ef3bf3d0..0d2d547a84a5 100644
> --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
> +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
> @@ -335,7 +335,7 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev,
>  		}
>  	}
>  
> -	if (src && dst && (m2m_ctx->cap_q_ctx.q.subsystem_flags &
> +	if (src && dst && (m2m_ctx->out_q_ctx.q.subsystem_flags &
>  			   VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF))
>  		m2m_ctx->new_frame = !dst->vb2_buf.copied_timestamp ||
>  			dst->vb2_buf.timestamp != src->vb2_buf.timestamp;
> 

You are right, this should be the output queue. But there is a second
use of VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF in this source in a
WARN_ON. Can you fix that as well?

Thanks!

	Hans