lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 092/313] media: DaVinci-VPBE: fix error handling in vpbe_initialize()
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit aa35dc3c71950e3fec3e230c06c27c0fbd0067f8 ]

    If vpbe_set_default_output() or vpbe_set_default_mode() fails,
    vpbe_initialize() returns error code without releasing resources.

    The patch adds error handling for that case.

    Found by Linux Driver Verification project (linuxtesting.org).

    Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/davinci/vpbe.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
    index 18c035ef84cf..df1ae6b5c854 100644
    --- a/drivers/media/platform/davinci/vpbe.c
    +++ b/drivers/media/platform/davinci/vpbe.c
    @@ -740,7 +740,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
    if (ret) {
    v4l2_err(&vpbe_dev->v4l2_dev, "Failed to set default output %s",
    def_output);
    - return ret;
    + goto fail_kfree_amp;
    }

    printk(KERN_NOTICE "Setting default mode to %s\n", def_mode);
    @@ -748,12 +748,15 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
    if (ret) {
    v4l2_err(&vpbe_dev->v4l2_dev, "Failed to set default mode %s",
    def_mode);
    - return ret;
    + goto fail_kfree_amp;
    }
    vpbe_dev->initialized = 1;
    /* TBD handling of bootargs for default output and mode */
    return 0;

    +fail_kfree_amp:
    + mutex_lock(&vpbe_dev->lock);
    + kfree(vpbe_dev->amp);
    fail_kfree_encoders:
    kfree(vpbe_dev->encoders);
    fail_dev_unregister:
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-11 15:45    [W:3.009 / U:1.780 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site