diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2012-09-01 23:49:37 +0400 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-09-28 15:05:13 +0930 |
| commit | 33e1afc3d82697599ccc8dc8f2fa44ffff5ae329 (patch) | |
| tree | b4b1c2b403a9b8a9a84c2a7d90e234b0703bec63 | |
| parent | 5b8fa822b71fa91b17c9fb38bcca31e771f7650d (diff) | |
| download | talos-op-linux-33e1afc3d82697599ccc8dc8f2fa44ffff5ae329.tar.gz talos-op-linux-33e1afc3d82697599ccc8dc8f2fa44ffff5ae329.zip | |
virtio: console: fix error handling in init() function
If register_virtio_driver() fails, virtio-ports class is not destroyed.
The patch adds error handling of register_virtio_driver().
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
| -rw-r--r-- | drivers/char/virtio_console.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index e88f84390428..8ab9c3d4bf13 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -2099,7 +2099,17 @@ static int __init init(void) INIT_LIST_HEAD(&pdrvdata.consoles); INIT_LIST_HEAD(&pdrvdata.portdevs); - return register_virtio_driver(&virtio_console); + err = register_virtio_driver(&virtio_console); + if (err < 0) { + pr_err("Error %d registering virtio driver\n", err); + goto free; + } + return 0; +free: + if (pdrvdata.debugfs_dir) + debugfs_remove_recursive(pdrvdata.debugfs_dir); + class_destroy(pdrvdata.class); + return err; } static void __exit fini(void) |
