From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 9 Aug 2013 10:59:55 +0000 (+0100)
Subject: Fix double-free and broken logic in virt-login-shell
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ac692e3af231651304a93d63cb54049d9e3d50f8;p=libvirt.git

Fix double-free and broken logic in virt-login-shell

The virLoginShellAllowedUser method must not free the 'groups'
parameter it is given, as that is owned by the caller.

The virLoginShellAllowedUser method should be checking
'!*ptr' (ie empty string) rather than '!ptr' (NULL string)
since the latter cannot be true.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/tools/virt-login-shell.c b/tools/virt-login-shell.c
index b8f1a28a8e..b27e44f1db 100644
--- a/tools/virt-login-shell.c
+++ b/tools/virt-login-shell.c
@@ -85,7 +85,7 @@ static int virLoginShellAllowedUser(virConfPtr conf,
                 */
                 if (pp->str[0] == '%') {
                     ptr = &pp->str[1];
-                    if (!ptr)
+                    if (!*ptr)
                         continue;
                     for (i = 0; groups[i]; i++) {
                         if (!(gname = virGetGroupName(groups[i])))
@@ -96,7 +96,6 @@ static int virLoginShellAllowedUser(virConfPtr conf,
                         }
                         VIR_FREE(gname);
                     }
-                    VIR_FREE(groups);
                     continue;
                 }
                 if (fnmatch(pp->str, name, 0) == 0) {
@@ -109,7 +108,6 @@ static int virLoginShellAllowedUser(virConfPtr conf,
     virReportSystemError(EPERM, _("%s not listed as an allowed_users in %s"), name, conf_file);
 cleanup:
     VIR_FREE(gname);
-    VIR_FREE(groups);
     return ret;
 }