[Qemu-devel] [PATCH 0/2] ACL fixes

[Qemu-devel] [PATCH 0/2] ACL fixes

[Markus Armbruster]

Markus Armbruster (2):
  acl: Fix acl_remove not to mess up the ACL
  acl: Free memory allocated with g_malloc() with g_free()

 util/acl.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

-- 
1.7.11.7

[Qemu-devel] [PATCH 1/2] acl: Fix acl_remove not to mess up the ACL

[Markus Armbruster]

It leaks memory and fails to adjust qemu_acl member nentries.  Future
acl_add become confused: can misreport the position, and can silently
fail to add.

Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 util/acl.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/util/acl.c b/util/acl.c
index 81ac255..21b2205 100644
--- a/util/acl.c
+++ b/util/acl.c
@@ -168,6 +168,9 @@ int qemu_acl_remove(qemu_acl *acl,
         i++;
         if (strcmp(entry->match, match) == 0) {
             QTAILQ_REMOVE(&acl->entries, entry, next);
+            acl->nentries--;
+            g_free(entry->match);
+            g_free(entry);
             return i;
         }
     }
-- 
1.7.11.7

[Qemu-devel] [PATCH 2/2] acl: Free memory allocated with g_malloc() with g_free()

[Markus Armbruster]

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 util/acl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/acl.c b/util/acl.c
index 21b2205..a7f33ff 100644
--- a/util/acl.c
+++ b/util/acl.c
@@ -103,8 +103,8 @@ void qemu_acl_reset(qemu_acl *acl)
     acl->defaultDeny = 1;
     QTAILQ_FOREACH_SAFE(entry, &acl->entries, next, next_entry) {
         QTAILQ_REMOVE(&acl->entries, entry, next);
-        free(entry->match);
-        free(entry);
+        g_free(entry->match);
+        g_free(entry);
     }
     acl->nentries = 0;
 }
-- 
1.7.11.7

Re: [Qemu-devel] [PATCH 0/2] ACL fixes

[Anthony Liguori]

Thanks, applied.

Regards,

Anthony Liguori