diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 9bcd36a8691ba05d10ade0d9300b994c733021b4..7c89adf077fde0a7c9e178d3f960687cb956ff11 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -820,29 +820,23 @@ virLockDaemonExecRestartStatePath(bool privileged,
     if (privileged) {
         *state_file = g_strdup(RUNSTATEDIR "/virtlockd-restart-exec.json");
     } else {
-        char *rundir = NULL;
+        g_autofree char *rundir = NULL;
         mode_t old_umask;
 
         if (!(rundir = virGetUserRuntimeDirectory()))
-            goto error;
+            return -1;
 
         old_umask = umask(077);
         if (virFileMakePath(rundir) < 0) {
             umask(old_umask);
-            VIR_FREE(rundir);
-            goto error;
+            return -1;
         }
         umask(old_umask);
 
         *state_file = g_strdup_printf("%s/virtlockd-restart-exec.json", rundir);
-
-        VIR_FREE(rundir);
     }
 
     return 0;
-
- error:
-    return -1;
 }