From 71c87815f9e0386b6f3e22942adc956fd603c82f Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 16 Feb 2018 19:14:55 +0100 Subject: rbd: Fix use after free in qemu_rbd_set_keypairs() error path If we want to include the invalid option name in the error message, we can't free the string earlier than that. Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Reviewed-by: Eric Blake --- block/rbd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'block/rbd.c') diff --git a/block/rbd.c b/block/rbd.c index c1275c1ec9..c1025c8493 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -268,13 +268,14 @@ static int qemu_rbd_set_keypairs(rados_t cluster, const char *keypairs_json, key = qstring_get_str(name); ret = rados_conf_set(cluster, key, qstring_get_str(value)); - QDECREF(name); QDECREF(value); if (ret < 0) { error_setg_errno(errp, -ret, "invalid conf option %s", key); + QDECREF(name); ret = -EINVAL; break; } + QDECREF(name); } QDECREF(keypairs); -- cgit v1.2.1