lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 171/862] media: cedrus: Fix endless loop in cedrus_h265_skip_bits()
    Date
    From: Dmitry Osipenko <dmitry.osipenko@collabora.com>

    commit 91db7a3fc7fe670cf1770a398a43bb4a1f776bf1 upstream.

    The busy status bit may never de-assert if number of programmed skip
    bits is incorrect, resulting in a kernel hang because the bit is polled
    endlessly in the code. Fix it by adding timeout for the bit-polling.
    This problem is reproducible by setting the data_bit_offset field of
    the HEVC slice params to a wrong value by userspace.

    Cc: stable@vger.kernel.org
    Fixes: 7678c5462680 (media: cedrus: Fix decoding for some HEVC videos)
    Reported-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
    Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
    Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
    +++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
    @@ -234,8 +234,9 @@ static void cedrus_h265_skip_bits(struct
    cedrus_write(dev, VE_DEC_H265_TRIGGER,
    VE_DEC_H265_TRIGGER_FLUSH_BITS |
    VE_DEC_H265_TRIGGER_TYPE_N_BITS(tmp));
    - while (cedrus_read(dev, VE_DEC_H265_STATUS) & VE_DEC_H265_STATUS_VLD_BUSY)
    - udelay(1);
    +
    + if (cedrus_wait_for(dev, VE_DEC_H265_STATUS, VE_DEC_H265_STATUS_VLD_BUSY))
    + dev_err_ratelimited(dev->dev, "timed out waiting to skip bits\n");

    count += tmp;
    }

    \
     
     \ /
      Last update: 2022-10-19 14:22    [W:3.567 / U:23.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site