lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 076/563] media: em28xx: fix memory leak in em28xx_init_dev
    Date
    From: Dongliang Mu <mudongliangabcd@gmail.com>

    [ Upstream commit 22be5a10d0b24eec9e45decd15d7e6112b25f080 ]

    In the em28xx_init_rev, if em28xx_audio_setup fails, this function fails
    to deallocate the media_dev allocated in the em28xx_media_device_init.

    Fix this by adding em28xx_unregister_media_device to free media_dev.

    BTW, this patch is tested in my local syzkaller instance, and it can
    prevent the memory leak from occurring again.

    CC: Pavel Skripkin <paskripkin@gmail.com>
    Fixes: 37ecc7b1278f ("[media] em28xx: add media controller support")
    Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
    Reported-by: syzkaller <syzkaller@googlegroups.com>
    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/usb/em28xx/em28xx-cards.c | 18 ++++++++++++------
    1 file changed, 12 insertions(+), 6 deletions(-)

    diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
    index cf45cc566cbe2..87e375562dbb2 100644
    --- a/drivers/media/usb/em28xx/em28xx-cards.c
    +++ b/drivers/media/usb/em28xx/em28xx-cards.c
    @@ -3575,8 +3575,10 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,

    if (dev->is_audio_only) {
    retval = em28xx_audio_setup(dev);
    - if (retval)
    - return -ENODEV;
    + if (retval) {
    + retval = -ENODEV;
    + goto err_deinit_media;
    + }
    em28xx_init_extension(dev);

    return 0;
    @@ -3595,7 +3597,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
    dev_err(&dev->intf->dev,
    "%s: em28xx_i2c_register bus 0 - error [%d]!\n",
    __func__, retval);
    - return retval;
    + goto err_deinit_media;
    }

    /* register i2c bus 1 */
    @@ -3611,9 +3613,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
    "%s: em28xx_i2c_register bus 1 - error [%d]!\n",
    __func__, retval);

    - em28xx_i2c_unregister(dev, 0);
    -
    - return retval;
    + goto err_unreg_i2c;
    }
    }

    @@ -3621,6 +3621,12 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
    em28xx_card_setup(dev);

    return 0;
    +
    +err_unreg_i2c:
    + em28xx_i2c_unregister(dev, 0);
    +err_deinit_media:
    + em28xx_unregister_media_device(dev);
    + return retval;
    }

    static int em28xx_duplicate_dev(struct em28xx *dev)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 21:04    [W:2.815 / U:0.816 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site