commit e277280a89ad3e2ed5a47f201c8a06678d38dac9
author Pavel Skripkin <paskripkin@gmail.com> Sun Mar 28 19:48:09 2021 +0300
committer Pavel Skripkin <paskripkin@gmail.com> Sun Mar 28 19:48:09 2021 +0300
tree 0d2372adf2bfcf56400e805e850fb7a587f5b19f
parent db24726bfefa68c606947a86132591568a06bfb4

usb: dvb-usb: fix memory leak in dvb_usb_adapter_init

syzbot reported memory leak in dvb-usb. The problem was
in invalid error handling in dvb_usb_adapter_init().

for (n = 0; n < d->props.num_adapters; n++) {
....
	if ((ret = dvb_usb_adapter_stream_init(adap)) ||
		(ret = dvb_usb_adapter_dvb_init(adap, adapter_nrs)) ||
		(ret = dvb_usb_adapter_frontend_init(adap))) {
		return ret;
	}
...
	d->num_adapters_initialized++;
...
}

In case of error in dvb_usb_adapter_dvb_init() or dvb_usb_adapter_dvb_init()
d->num_adapters_initialized won't be incremented, but dvb_usb_adapter_exit()
relies on this:

	for (n = 0; n < d->num_adapters_initialized; n++)

So, allocated objects won't be freed.

Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Reported-by: syzbot+3c2be7424cea3b932b0e@syzkaller.appspotmail.com
Change-Id: Ic2bfba5504ea85fddbf7682f20ed1788d42fd84d

drivers/media/usb/dvb-usb/dvb-usb-init.c

diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c
index c1a7634..3807098 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c
@@ -79,11 +79,14 @@
 			}
 		}
 
-		if ((ret = dvb_usb_adapter_stream_init(adap)) ||
-			(ret = dvb_usb_adapter_dvb_init(adap, adapter_nrs)) ||
-			(ret = dvb_usb_adapter_frontend_init(adap))) {
+		if ((ret = dvb_usb_adapter_stream_init(adap)))
 			return ret;
-		}
+
+		if ((ret = dvb_usb_adapter_dvb_init(adap, adapter_nrs)))
+			goto dvb_init_err;
+
+		if ((ret = dvb_usb_adapter_frontend_init(adap)))
+			goto frontend_init_err;
 
 		/* use exclusive FE lock if there is multiple shared FEs */
 		if (adap->fe_adap[1].fe)
@@ -103,6 +106,12 @@
 	}
 
 	return 0;
+
+frontend_init_err:
+	dvb_usb_adapter_dvb_exit(adap);
+dvb_init_err:
+	dvb_usb_adapter_stream_exit(adap);
+	return ret;
 }
 
 static int dvb_usb_adapter_exit(struct dvb_usb_device *d)