Patchwork [1/2] qemu-ga: ga_open_pidfile(): use qemu_open()

login
register
mail settings
Submitter Luiz Capitulino
Date Jan. 8, 2013, 9:26 p.m.
Message ID <1357680386-10904-2-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/210541/
State New
Headers show

Comments

Luiz Capitulino - Jan. 8, 2013, 9:26 p.m.
This ensures that O_CLOEXEC is passed to open(), this way the
pid file fd is not leaked to executed processes.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 qga/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Eric Blake - Jan. 8, 2013, 11:06 p.m.
On 01/08/2013 02:26 PM, Luiz Capitulino wrote:
> This ensures that O_CLOEXEC is passed to open(), this way the
> pid file fd is not leaked to executed processes.
> 
> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
> ---
>  qga/main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/qga/main.c b/qga/main.c
> index ba5fa1c..e4245cc 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -242,7 +242,7 @@ static bool ga_open_pidfile(const char *pidfile)
>      int pidfd;
>      char pidstr[32];
>  
> -    pidfd = open(pidfile, O_CREAT|O_WRONLY, S_IRUSR|S_IWUSR);
> +    pidfd = qemu_open(pidfile, O_CREAT|O_WRONLY, S_IRUSR|S_IWUSR);
>      if (pidfd == -1 || lockf(pidfd, F_TLOCK, 0)) {
>          g_critical("Cannot lock pid file, %s", strerror(errno));
>          if (pidfd != -1) {
>

Patch

diff --git a/qga/main.c b/qga/main.c
index ba5fa1c..e4245cc 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -242,7 +242,7 @@  static bool ga_open_pidfile(const char *pidfile)
     int pidfd;
     char pidstr[32];
 
-    pidfd = open(pidfile, O_CREAT|O_WRONLY, S_IRUSR|S_IWUSR);
+    pidfd = qemu_open(pidfile, O_CREAT|O_WRONLY, S_IRUSR|S_IWUSR);
     if (pidfd == -1 || lockf(pidfd, F_TLOCK, 0)) {
         g_critical("Cannot lock pid file, %s", strerror(errno));
         if (pidfd != -1) {