mirror of
https://gitlab.freedesktop.org/wayland/wayland.git
synced 2025-11-24 06:59:50 -05:00
Calling close() on the same file descriptor that a previous call to
close() already closed is wrong, and racy if another thread received
that same file descriptor as a eg. new socket or actual file.
There are two situations where wl_connection_destroy() would close its
file descriptor and then another function up in the call chain would
close the same file descriptor:
* When wl_client_create() fails after calling wl_connection_create(),
it will call wl_connection_destroy() before returning. However, its
caller will always close the file descriptor if wl_client_create()
fails.
* wl_display_disconnect() unconditionally closes the display file
descriptor and also calls wl_connection_destroy().
So these two seem to expect wl_connection_destroy() to leave the file
descriptor open. The other caller of wl_connection_destroy(),
wl_client_destroy(), does however expect wl_connection_destroy() to
close its file descriptor, alas.
This patch changes wl_connection_destroy() to indulge this majority of
two callers by simply not closing the file descriptor. For the benefit
of wl_client_destroy(), wl_connection_destroy() then returns the
unclosed file descriptor so that wl_client_destroy() can close it
itself.
Since wl_connection_destroy() is a private function called from few
places, changing its semantics seemed like the more expedient way to
address the double-close() problem than shuffling around the logic in
wl_client_create() to somehow enable it to always avoid calling
wl_connection_destroy().
Signed-off-by: Benjamin Herr <ben@0x539.de>
Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
176 lines
5.7 KiB
C
176 lines
5.7 KiB
C
/*
|
|
* Copyright © 2008-2011 Kristian Høgsberg
|
|
* Copyright © 2011 Intel Corporation
|
|
* Copyright © 2013 Jason Ekstrand
|
|
*
|
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
|
* documentation for any purpose is hereby granted without fee, provided that
|
|
* the above copyright notice appear in all copies and that both that copyright
|
|
* notice and this permission notice appear in supporting documentation, and
|
|
* that the name of the copyright holders not be used in advertising or
|
|
* publicity pertaining to distribution of the software without specific,
|
|
* written prior permission. The copyright holders make no representations
|
|
* about the suitability of this software for any purpose. It is provided "as
|
|
* is" without express or implied warranty.
|
|
*
|
|
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
|
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
|
* OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#ifndef WAYLAND_PRIVATE_H
|
|
#define WAYLAND_PRIVATE_H
|
|
|
|
#include <stdarg.h>
|
|
|
|
#define WL_HIDE_DEPRECATED 1
|
|
|
|
#include "wayland-util.h"
|
|
|
|
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
|
|
|
|
#define container_of(ptr, type, member) ({ \
|
|
const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \
|
|
(type *)( (char *)__mptr - offsetof(type,member) );})
|
|
|
|
#define WL_MAP_SERVER_SIDE 0
|
|
#define WL_MAP_CLIENT_SIDE 1
|
|
#define WL_SERVER_ID_START 0xff000000
|
|
#define WL_CLOSURE_MAX_ARGS 20
|
|
|
|
struct wl_object {
|
|
const struct wl_interface *interface;
|
|
const void *implementation;
|
|
uint32_t id;
|
|
};
|
|
|
|
extern struct wl_object global_zombie_object;
|
|
#define WL_ZOMBIE_OBJECT ((void*)&global_zombie_object)
|
|
|
|
/* Flags for wl_map_insert_new and wl_map_insert_at. Flags can be queried with
|
|
* wl_map_lookup_flags. The current implementation has room for 1 bit worth of
|
|
* flags. If more flags are ever added, the implementation of wl_map will have
|
|
* to change to allow for new flags */
|
|
enum wl_map_entry_flags {
|
|
WL_MAP_ENTRY_LEGACY = (1 << 0)
|
|
};
|
|
|
|
struct wl_map {
|
|
struct wl_array client_entries;
|
|
struct wl_array server_entries;
|
|
uint32_t side;
|
|
uint32_t free_list;
|
|
};
|
|
|
|
typedef void (*wl_iterator_func_t)(void *element, void *data);
|
|
|
|
void wl_map_init(struct wl_map *map, uint32_t side);
|
|
void wl_map_release(struct wl_map *map);
|
|
uint32_t wl_map_insert_new(struct wl_map *map, uint32_t flags, void *data);
|
|
int wl_map_insert_at(struct wl_map *map, uint32_t flags, uint32_t i, void *data);
|
|
int wl_map_reserve_new(struct wl_map *map, uint32_t i);
|
|
void wl_map_remove(struct wl_map *map, uint32_t i);
|
|
void *wl_map_lookup(struct wl_map *map, uint32_t i);
|
|
uint32_t wl_map_lookup_flags(struct wl_map *map, uint32_t i);
|
|
void wl_map_for_each(struct wl_map *map, wl_iterator_func_t func, void *data);
|
|
|
|
struct wl_connection;
|
|
struct wl_closure;
|
|
struct wl_proxy;
|
|
|
|
int wl_interface_equal(const struct wl_interface *iface1,
|
|
const struct wl_interface *iface2);
|
|
|
|
struct wl_connection *wl_connection_create(int fd);
|
|
int wl_connection_destroy(struct wl_connection *connection);
|
|
void wl_connection_copy(struct wl_connection *connection, void *data, size_t size);
|
|
void wl_connection_consume(struct wl_connection *connection, size_t size);
|
|
|
|
int wl_connection_flush(struct wl_connection *connection);
|
|
int wl_connection_read(struct wl_connection *connection);
|
|
|
|
int wl_connection_write(struct wl_connection *connection, const void *data, size_t count);
|
|
int wl_connection_queue(struct wl_connection *connection,
|
|
const void *data, size_t count);
|
|
|
|
struct wl_closure {
|
|
int count;
|
|
const struct wl_message *message;
|
|
uint32_t opcode;
|
|
uint32_t sender_id;
|
|
union wl_argument args[WL_CLOSURE_MAX_ARGS];
|
|
struct wl_list link;
|
|
struct wl_proxy *proxy;
|
|
struct wl_array extra[0];
|
|
};
|
|
|
|
struct argument_details {
|
|
char type;
|
|
int nullable;
|
|
};
|
|
|
|
const char *
|
|
get_next_argument(const char *signature, struct argument_details *details);
|
|
|
|
int
|
|
arg_count_for_signature(const char *signature);
|
|
|
|
int
|
|
wl_message_get_since(const struct wl_message *message);
|
|
|
|
void
|
|
wl_argument_from_va_list(const char *signature, union wl_argument *args,
|
|
int count, va_list ap);
|
|
|
|
struct wl_closure *
|
|
wl_closure_marshal(struct wl_object *sender,
|
|
uint32_t opcode, union wl_argument *args,
|
|
const struct wl_message *message);
|
|
struct wl_closure *
|
|
wl_closure_vmarshal(struct wl_object *sender,
|
|
uint32_t opcode, va_list ap,
|
|
const struct wl_message *message);
|
|
|
|
struct wl_closure *
|
|
wl_connection_demarshal(struct wl_connection *connection,
|
|
uint32_t size,
|
|
struct wl_map *objects,
|
|
const struct wl_message *message);
|
|
|
|
int
|
|
wl_closure_lookup_objects(struct wl_closure *closure, struct wl_map *objects);
|
|
|
|
enum wl_closure_invoke_flag {
|
|
WL_CLOSURE_INVOKE_CLIENT = (1 << 0),
|
|
WL_CLOSURE_INVOKE_SERVER = (1 << 1)
|
|
};
|
|
|
|
void
|
|
wl_closure_invoke(struct wl_closure *closure, uint32_t flags,
|
|
struct wl_object *target, uint32_t opcode, void *data);
|
|
void
|
|
wl_closure_dispatch(struct wl_closure *closure, wl_dispatcher_func_t dispatcher,
|
|
struct wl_object *target, uint32_t opcode);
|
|
int
|
|
wl_closure_send(struct wl_closure *closure, struct wl_connection *connection);
|
|
int
|
|
wl_closure_queue(struct wl_closure *closure, struct wl_connection *connection);
|
|
void
|
|
wl_closure_print(struct wl_closure *closure, struct wl_object *target, int send);
|
|
void
|
|
wl_closure_destroy(struct wl_closure *closure);
|
|
|
|
extern wl_log_func_t wl_log_handler;
|
|
|
|
void wl_log(const char *fmt, ...);
|
|
|
|
struct wl_display;
|
|
|
|
struct wl_array *
|
|
wl_display_get_additional_shm_formats(struct wl_display *display);
|
|
|
|
#endif
|