Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4e4a67a authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Mauro Carvalho Chehab
Browse files

[media] ddbridge: fix error handling in module_init_ddbridge() 



If pci_register_driver() failed, resources allocated in
ddb_class_create() are leaked. The patch fixes it
as well as it replaces -1 with correct error code
in ddb_class_create().

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

Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4b83a7a7

drivers/media/pci/ddbridge/ddbridge-core.c

+11 −4
Original line number Diff line number Diff line
@@ -1497,7 +1497,7 @@ static int ddb_class_create(void) 
	ddb_class = class_create(THIS_MODULE, DDB_NAME);

	if (IS_ERR(ddb_class)) {

		unregister_chrdev(ddb_major, DDB_NAME);

		return -1;

		return PTR_ERR(ddb_class);

	}

	ddb_class->devnode = ddb_devnode;

	return 0;
@@ -1701,11 +1701,18 @@ static struct pci_driver ddb_pci_driver = { 


static __init int module_init_ddbridge(void)

{

	int ret;



	printk(KERN_INFO "Digital Devices PCIE bridge driver, "

	       "Copyright (C) 2010-11 Digital Devices GmbH\n");

	if (ddb_class_create())

		return -1;

	return pci_register_driver(&ddb_pci_driver);



	ret = ddb_class_create();

	if (ret < 0)

		return ret;

	ret = pci_register_driver(&ddb_pci_driver);

	if (ret < 0)

		ddb_class_destroy();

	return ret;

}



static __exit void module_exit_ddbridge(void)