lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 202/775] media: media/pci: Fix memleak in empress_init
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit 15d0c52241ecb1c9d802506bff6f5c3f7872c0df ]

    When vb2_queue_init() fails, dev->empress_dev
    should be released just like other error handling
    paths.

    Fixes: 2ada815fc48bb ("[media] saa7134: convert to vb2")
    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/pci/saa7134/saa7134-empress.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c
    index 39e3c7f8c5b46..76a37fbd84587 100644
    --- a/drivers/media/pci/saa7134/saa7134-empress.c
    +++ b/drivers/media/pci/saa7134/saa7134-empress.c
    @@ -282,8 +282,11 @@ static int empress_init(struct saa7134_dev *dev)
    q->lock = &dev->lock;
    q->dev = &dev->pci->dev;
    err = vb2_queue_init(q);
    - if (err)
    + if (err) {
    + video_device_release(dev->empress_dev);
    + dev->empress_dev = NULL;
    return err;
    + }
    dev->empress_dev->queue = q;
    dev->empress_dev->device_caps = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |
    V4L2_CAP_VIDEO_CAPTURE;
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 00:40    [W:3.385 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site