diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2012-09-01 23:49:37 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-05 13:44:04 -0700 |
| commit | efda0ad4aa92439d9244d77a13339e23df5e1dc1 (patch) | |
| tree | 5fe8307deb2c87e2d00d2819d73ef2fc2cb5b3bb | |
| parent | 9a32bb39d6a48d435135695763e5e4a06652eeda (diff) | |
| download | linux-stable-efda0ad4aa92439d9244d77a13339e23df5e1dc1.tar.gz linux-stable-efda0ad4aa92439d9244d77a13339e23df5e1dc1.tar.bz2 linux-stable-efda0ad4aa92439d9244d77a13339e23df5e1dc1.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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 cdf2f5451c76..060a672ebb7b 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -1941,7 +1941,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) |