From 52609ddf79a96fee0465006e2c6339a3a5d23a87 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 6 Dec 2017 11:22:19 -0600 Subject: [PATCH] connection: Clear fds we shouldn't close to -1 This initializes all the fd arguments in closures to -1 and clears them back to -1 when they've been dispatched or serialized. This means that any valid fd in a closure is currently libwayland's responsibility to close in the case of an error. Signed-off-by: Derek Foreman Reviewed-by: Daniel Stone --- src/connection.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/connection.c b/src/connection.c index 8d8eb60..29f565b 100644 --- a/src/connection.c +++ b/src/connection.c @@ -524,6 +524,17 @@ wl_argument_from_va_list(const char *signature, union wl_argument *args, } } +static void +wl_closure_clear_fds(struct wl_closure *closure) +{ + int i; + + for (i = 0; closure->message->signature[i]; i++) { + if (closure->message->signature[i] == 'h') + closure->args[i].h = -1; + } +} + static struct wl_closure * wl_closure_init(const struct wl_message *message, uint32_t size, int *num_arrays, union wl_argument *args) @@ -557,6 +568,14 @@ wl_closure_init(const struct wl_message *message, uint32_t size, closure->message = message; closure->count = count; + /* Set these all to -1 so we can close any that have been + * set to a real value during wl_closure_destroy(). + * We may have copied a bunch of fds into the closure with + * memcpy previously, but those are undup()d client fds + * that we would have replaced anyway. + */ + wl_closure_clear_fds(closure); + return closure; } @@ -948,6 +967,8 @@ wl_closure_invoke(struct wl_closure *closure, uint32_t flags, opcode, target->interface->name); } ffi_call(&cif, implementation[opcode], NULL, ffi_args); + + wl_closure_clear_fds(closure); } void @@ -956,6 +977,8 @@ wl_closure_dispatch(struct wl_closure *closure, wl_dispatcher_func_t dispatcher, { dispatcher(target->implementation, target, opcode, closure->message, closure->args); + + wl_closure_clear_fds(closure); } static int @@ -980,6 +1003,7 @@ copy_fds_to_connection(struct wl_closure *closure, "can't send file descriptor"); return -1; } + closure->args[i].h = -1; } return 0; -- 2.7.4