]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: em28xx: fix memory leak
authorMuhammad Usama Anjum <musamaanjum@gmail.com>
Wed, 24 Mar 2021 18:07:53 +0000 (19:07 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 12 May 2021 06:37:25 +0000 (08:37 +0200)
[ Upstream commit 0ae10a7dc8992ee682ff0b1752ff7c83d472eef1 ]

If some error occurs, URB buffers should also be freed. If they aren't
freed with the dvb here, the em28xx_dvb_fini call doesn't frees the URB
buffers as dvb is set to NULL. The function in which error occurs should
do all the cleanup for the allocations it had done.

Tested the patch with the reproducer provided by syzbot. This patch
fixes the memleak.

Reported-by: syzbot+889397c820fa56adf25d@syzkaller.appspotmail.com
Signed-off-by: Muhammad Usama Anjum <musamaanjum@gmail.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-dvb.c

index fb9cbfa81a84b3cf95a180eea6170a375f286f4e..3cd9e9556fa9fcf7f48d0b1bf8b00ea0c231714a 100644 (file)
@@ -1984,6 +1984,7 @@ ret:
        return result;
 
 out_free:
+       em28xx_uninit_usb_xfer(dev, EM28XX_DIGITAL_MODE);
        kfree(dvb);
        dev->dvb = NULL;
        goto ret;