[PULL,v2,12/13] softmmu/qdev-monitor: fix use-after-free in qdev_set_id()

Commit Message

Hanna Czenczek Nov. 16, 2021, 1:06 p.m. UTC

From: Stefan Hajnoczi <[e-mail]>

Reported by Coverity (CID 1465222).

Fixes: 4a1d937796de0fecd8b22d7dbebf87f38e8282fd ("softmmu/qdev-monitor: add error handling in qdev_set_id")
Cc: Damien Hedde <[e-mail]>
Cc: Kevin Wolf <[e-mail]>
Cc: Michael S. Tsirkin <[e-mail]>
Signed-off-by: Stefan Hajnoczi <[e-mail]>
Message-Id: <[e-mail]>
Reviewed-by: Kevin Wolf <[e-mail]>
Reviewed-by: Michael S. Tsirkin <[e-mail]>
Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>
Reviewed-by: Marc-André Lureau <[e-mail]>
Reviewed-by: Damien Hedde <[e-mail]>
Reviewed-by: Markus Armbruster <[e-mail]>
Signed-off-by: Kevin Wolf <[e-mail]>
Message-Id: <[e-mail]>
Signed-off-by: Hanna Reitz <[e-mail]>
---
 softmmu/qdev-monitor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index b5aaae4b8c..01ec420e61 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -593,8 +593,8 @@  const char *qdev_set_id(DeviceState *dev, char *id, Error **errp)
         if (prop) {
             dev->id = id;
         } else {
-            g_free(id);
             error_setg(errp, "Duplicate device ID '%s'", id);
+            g_free(id);
             return NULL;
         }
     } else {