30 lines
946 B
Diff
30 lines
946 B
Diff
From: Greg Kurz <groug@kaod.org>
|
|
Date: Tue, 3 Jan 2017 17:28:44 +0100
|
|
Subject: [PATCH] 9pfs: fix crash when fsdev is missing
|
|
|
|
If the user passes -device virtio-9p without the corresponding -fsdev, QEMU
|
|
dereferences a NULL pointer and crashes.
|
|
|
|
This is a 2.8 regression introduced by commit 702dbcc274e2c.
|
|
|
|
Signed-off-by: Greg Kurz <groug@kaod.org>
|
|
Reviewed-by: Li Qiang <liq3ea@gmail.com>
|
|
(cherry picked from commit f2b58c43758efc61e2a49b899f5e58848489d0dc)
|
|
---
|
|
hw/9pfs/9p.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
|
|
index 641a348234..9a89f75d90 100644
|
|
--- a/hw/9pfs/9p.c
|
|
+++ b/hw/9pfs/9p.c
|
|
@@ -3492,7 +3492,7 @@ int v9fs_device_realize_common(V9fsState *s, Error **errp)
|
|
rc = 0;
|
|
out:
|
|
if (rc) {
|
|
- if (s->ops->cleanup && s->ctx.private) {
|
|
+ if (s->ops && s->ops->cleanup && s->ctx.private) {
|
|
s->ops->cleanup(&s->ctx);
|
|
}
|
|
g_free(s->tag);
|