[PATCH / 4.0.1] fix fd leak in xenstore

[PATCH / 4.0.1] fix fd leak in xenstore

[Olaf Hering]

Missing from commit 'libxl: Backported stuff from unstable'
Without this change, xs_daemon_open/xs_daemon_close will leak filedescriptors.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

---
 tools/xenstore/xs.c |    2 ++
 1 file changed, 2 insertions(+)

--- xen-4.0.1-testing.orig/tools/xenstore/xs.c
+++ xen-4.0.1-testing/tools/xenstore/xs.c
@@ -285,6 +285,8 @@ void xs_daemon_close(struct xs_handle *h
 	mutex_unlock(&h->request_mutex);
 	mutex_unlock(&h->reply_mutex);
 	mutex_unlock(&h->watch_mutex);
+
+	close_fds_free(h);
 }
 
 static bool read_all(int fd, void *data, unsigned int len)

Re: [PATCH / 4.0.1] fix fd leak in xenstore

[Gianni Tedesco]

On Tue, 2010-09-14 at 15:37 +0100, Olaf Hering wrote:
> Missing from commit 'libxl: Backported stuff from unstable'
> Without this change, xs_daemon_open/xs_daemon_close will leak filedescriptors.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> ---
>  tools/xenstore/xs.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> --- xen-4.0.1-testing.orig/tools/xenstore/xs.c
> +++ xen-4.0.1-testing/tools/xenstore/xs.c
> @@ -285,6 +285,8 @@ void xs_daemon_close(struct xs_handle *h
>  	mutex_unlock(&h->request_mutex);
>  	mutex_unlock(&h->reply_mutex);
>  	mutex_unlock(&h->watch_mutex);
> +
> +	close_fds_free(h);
>  }
>  
>  static bool read_all(int fd, void *data, unsigned int len)

ack, well spotted

Gianni

Re: [PATCH / 4.0.1] fix fd leak in xenstore [and 1 more messages]

[Ian Jackson]

Olaf Hering writes ("[Xen-devel] [PATCH / 4.0.1] fix fd leak in xenstore"):
> 
> Missing from commit 'libxl: Backported stuff from unstable'
> Without this change, xs_daemon_open/xs_daemon_close will leak filedescriptors.

You are right.

Keir, could you please apply Olaf's patch to xen-4.0-testing ?

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Gianni Tedesco <gianni.tedesco@citrix.com>

Thanks,
Ian.