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

Commit 74b643da authored by Stefan Achatz's avatar Stefan Achatz Committed by Jiri Kosina
Browse files

HID: roccat: Fix NULL pointer dereference when unloading module 



Class was destroyed before starting the unregistering driver chain.
Disconnecting a device from roccat chardev in this process then
raised a NULL pointer dereference.
Fixed this by destroying class after unregistering driver.

Signed-off-by: default avatarStefan Achatz <erazor_de@users.sourceforge.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 8211e460

drivers/hid/hid-roccat-arvo.c

+1 −1
Original line number Diff line number Diff line
@@ -438,8 +438,8 @@ static int __init arvo_init(void) 


static void __exit arvo_exit(void)

{

	class_destroy(arvo_class);

	hid_unregister_driver(&arvo_driver);

	class_destroy(arvo_class);

}



module_init(arvo_init);

drivers/hid/hid-roccat-kone.c

+1 −1
Original line number Diff line number Diff line
@@ -844,8 +844,8 @@ static int __init kone_init(void) 


static void __exit kone_exit(void)

{

	class_destroy(kone_class);

	hid_unregister_driver(&kone_driver);

	class_destroy(kone_class);

}



module_init(kone_init);

drivers/hid/hid-roccat-koneplus.c

+1 −1
Original line number Diff line number Diff line
@@ -774,8 +774,8 @@ static int __init koneplus_init(void) 


static void __exit koneplus_exit(void)

{

	class_destroy(koneplus_class);

	hid_unregister_driver(&koneplus_driver);

	class_destroy(koneplus_class);

}



module_init(koneplus_init);

drivers/hid/hid-roccat-kovaplus.c

+1 −1
Original line number Diff line number Diff line
@@ -703,8 +703,8 @@ static int __init kovaplus_init(void) 


static void __exit kovaplus_exit(void)

{

	class_destroy(kovaplus_class);

	hid_unregister_driver(&kovaplus_driver);

	class_destroy(kovaplus_class);

}



module_init(kovaplus_init);

drivers/hid/hid-roccat-pyra.c

+1 −1
Original line number Diff line number Diff line
@@ -685,8 +685,8 @@ static int __init pyra_init(void) 


static void __exit pyra_exit(void)

{

	class_destroy(pyra_class);

	hid_unregister_driver(&pyra_driver);

	class_destroy(pyra_class);

}



module_init(pyra_init);