From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 19 May 2025 13:20:33 +0000 (+0200)
Subject: virSecuritySELinuxTransactionRun: Refactor cleanup
X-Git-Tag: v11.6.0-rc1~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79d2f496a57358532a898fd6db59691b3dca1b03;p=thirdparty%2Flibvirt.git

virSecuritySELinuxTransactionRun: Refactor cleanup

Automatically free 'paths' and remove temporary variable.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 64e7f41ce0..0326073810 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -282,11 +282,10 @@ virSecuritySELinuxTransactionRun(pid_t pid G_GNUC_UNUSED,
 {
     virSecuritySELinuxContextList *list = opaque;
     virSecurityManagerMetadataLockState *state;
-    const char **paths = NULL;
+    g_autofree const char **paths = NULL;
     size_t npaths = 0;
     size_t i;
     int rv;
-    int ret = -1;
 
     if (list->lock) {
         paths = g_new0(const char *, list->nItems);
@@ -303,7 +302,7 @@ virSecuritySELinuxTransactionRun(pid_t pid G_GNUC_UNUSED,
                                                      list->sharedFilesystems,
                                                      paths, npaths,
                                                      list->lockMetadataException)))
-            goto cleanup;
+            return -1;
 
         for (i = 0; i < list->nItems; i++) {
             virSecuritySELinuxContextItem *item = list->items[i];
@@ -357,12 +356,9 @@ virSecuritySELinuxTransactionRun(pid_t pid G_GNUC_UNUSED,
         virSecurityManagerMetadataUnlock(list->manager, &state);
 
     if (rv < 0)
-        goto cleanup;
+        return -1;
 
-    ret = 0;
- cleanup:
-    VIR_FREE(paths);
-    return ret;
+    return 0;
 }