Re: [PATCH] vircgroup: Don't leak keypath if failed to kill process

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



ping

> -----Original Message-----
> From: Chen, Hanxiao/陈 晗霄
> Sent: Tuesday, May 13, 2014 4:01 PM
> To: libvir-list@xxxxxxxxxx
> Cc: Chen, Hanxiao/陈 晗霄
> Subject: [PATCH] vircgroup: Don't leak keypath if failed to kill process
> 
> Signed-off-by: Chen Hanxiao <chenhanxiao@xxxxxxxxxxxxxx>
> ---
>  src/util/vircgroup.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
> index fce380a..c578bd0 100644
> --- a/src/util/vircgroup.c
> +++ b/src/util/vircgroup.c
> @@ -3370,7 +3370,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
>      int rc;
>      bool killedAny = false;
>      char *keypath = NULL;
> -    DIR *dp;
> +    DIR *dp = NULL;
>      virCgroupPtr subgroup = NULL;
>      struct dirent *ent;
>      int direrr;
> @@ -3381,7 +3381,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
>          return -1;
> 
>      if ((rc = virCgroupKillInternal(group, signum, pids)) < 0)
> -        return -1;
> +        goto cleanup;
>      if (rc == 1)
>          killedAny = true;
> 
> @@ -3394,7 +3394,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
>          }
>          virReportSystemError(errno,
>                               _("Cannot open %s"), keypath);
> -        return -1;
> +        goto cleanup;
>      }
> 
>      while ((direrr = virDirRead(dp, &ent, keypath)) > 0) {
> @@ -3429,7 +3429,9 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
> 
>   cleanup:
>      virCgroupFree(&subgroup);
> -    closedir(dp);
> +    VIR_FREE(keypath);
> +    if (dp)
> +        closedir(dp);
> 
>      return ret;
>  }
> --
> 1.9.0


--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list





[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]