diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2019-04-30 22:39:33 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-31 07:28:39 +0200 |
| commit | 70a6cebb9bf303d69bba3ded940877225584f60b (patch) | |
| tree | 598123f32a939c4c78f574a3eb88e507b4f03923 /net/9p/trans_xen.c | |
| parent | 93774aa0954cf393a09217b01f0a371b1f9eedf5 (diff) | |
9p/xen: Add cleanup path in p9_trans_xen_init
commit 80a316ff16276b36d0392a8f8b2f63259857ae98 upstream.
If xenbus_register_frontend() fails in p9_trans_xen_init,
we should call v9fs_unregister_trans() to do cleanup.
Link: http://lkml.kernel.org/r/20190430143933.19368-1-yuehaibing@huawei.com
Cc: stable@vger.kernel.org
Fixes: 868eb122739a ("xen/9pfs: introduce Xen 9pfs transport driver")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Dominique Martinet <dominique.martinet@cea.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/9p/trans_xen.c')
| -rw-r--r-- | net/9p/trans_xen.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c index 389eb635ec2c..ea9f1773abc8 100644 --- a/net/9p/trans_xen.c +++ b/net/9p/trans_xen.c @@ -530,13 +530,19 @@ static struct xenbus_driver xen_9pfs_front_driver = { static int p9_trans_xen_init(void) { + int rc; + if (!xen_domain()) return -ENODEV; pr_info("Initialising Xen transport for 9pfs\n"); v9fs_register_trans(&p9_xen_trans); - return xenbus_register_frontend(&xen_9pfs_front_driver); + rc = xenbus_register_frontend(&xen_9pfs_front_driver); + if (rc) + v9fs_unregister_trans(&p9_xen_trans); + + return rc; } module_init(p9_trans_xen_init); |