4c7d1af70b
Last set of commits introduced a bug. When adding of socket with a particular name fails, then the socket and its lockfile are deleted regardless who created the socket. /* OK */ wl_display_add_socket(display, "wayland-0"); /* this call fails and will delete the original socket */ wl_display_add_socket(display, "wayland-0"); Signed-off-by: Marek Chalupa <mchqwerty@gmail.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
171 lines
4.5 KiB
C
171 lines
4.5 KiB
C
/*
|
|
* 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.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <sys/un.h>
|
|
#include <unistd.h>
|
|
|
|
#include "wayland-client.h"
|
|
#include "wayland-server.h"
|
|
#include "test-runner.h"
|
|
|
|
/* Paths longer than what the .sun_path array can contain must be rejected.
|
|
This is a hard limitation of assigning a name to AF_UNIX/AF_LOCAL sockets.
|
|
See `man 7 unix`. */
|
|
|
|
static const struct sockaddr_un example_sockaddr_un;
|
|
|
|
#define TOO_LONG (1 + sizeof example_sockaddr_un.sun_path)
|
|
|
|
/* Ensure the connection doesn't fail due to lack of XDG_RUNTIME_DIR. */
|
|
static const char *
|
|
require_xdg_runtime_dir(void)
|
|
{
|
|
char *val = getenv("XDG_RUNTIME_DIR");
|
|
if (!val)
|
|
assert(0 && "set $XDG_RUNTIME_DIR to run this test");
|
|
|
|
return val;
|
|
}
|
|
|
|
TEST(socket_path_overflow_client_connect)
|
|
{
|
|
char path[TOO_LONG];
|
|
struct wl_display *d;
|
|
|
|
require_xdg_runtime_dir();
|
|
|
|
memset(path, 'a', sizeof path);
|
|
path[sizeof path - 1] = '\0';
|
|
|
|
d = wl_display_connect(path);
|
|
assert(d == NULL);
|
|
assert(errno == ENAMETOOLONG);
|
|
}
|
|
|
|
TEST(socket_path_overflow_server_create)
|
|
{
|
|
char path[TOO_LONG];
|
|
struct wl_display *d;
|
|
int ret;
|
|
|
|
require_xdg_runtime_dir();
|
|
|
|
memset(path, 'a', sizeof path);
|
|
path[sizeof path - 1] = '\0';
|
|
|
|
d = wl_display_create();
|
|
assert(d != NULL);
|
|
|
|
ret = wl_display_add_socket(d, path);
|
|
assert(ret < 0);
|
|
assert(errno == ENAMETOOLONG);
|
|
|
|
wl_display_destroy(d);
|
|
}
|
|
|
|
TEST(add_existing_socket)
|
|
{
|
|
char path[sizeof example_sockaddr_un.sun_path];
|
|
const char *name = "wayland-test-0";
|
|
const char *xdg_runtime_dir;
|
|
struct wl_display *d;
|
|
int ret;
|
|
size_t len;
|
|
|
|
xdg_runtime_dir = require_xdg_runtime_dir();
|
|
|
|
d = wl_display_create();
|
|
assert(d != NULL);
|
|
|
|
/* this one should be OK */
|
|
ret = wl_display_add_socket(d, name);
|
|
assert(ret == 0);
|
|
|
|
/* this on should fail */
|
|
ret = wl_display_add_socket(d, name);
|
|
assert(ret < 0);
|
|
|
|
/* the original socket should still exists,
|
|
* this was a bug introduced in e2c0d47b0c77f18cd90e9c6eabb358c4d89681c8 */
|
|
len = snprintf(path, sizeof example_sockaddr_un.sun_path, "%s/%s",
|
|
xdg_runtime_dir, name);
|
|
assert(len < sizeof example_sockaddr_un.sun_path
|
|
&& "Bug in test. Path too long");
|
|
|
|
assert(access(path, F_OK) != -1);
|
|
|
|
/* still should exists the original socket */
|
|
ret = wl_display_add_socket(d, name);
|
|
assert(ret < 0);
|
|
|
|
wl_display_destroy(d);
|
|
}
|
|
|
|
TEST(add_socket_auto)
|
|
{
|
|
/* the number of auto sockets is currently 32 */
|
|
const int MAX_SOCKETS = 32;
|
|
|
|
char path[sizeof example_sockaddr_un.sun_path];
|
|
const char *name;
|
|
const char *xdg_runtime_dir;
|
|
struct wl_display *d;
|
|
int i;
|
|
size_t len;
|
|
|
|
xdg_runtime_dir = require_xdg_runtime_dir();
|
|
|
|
d = wl_display_create();
|
|
assert(d != NULL);
|
|
|
|
for (i = 0; i <= MAX_SOCKETS; ++i) {
|
|
name = wl_display_add_socket_auto(d);
|
|
assert(name != NULL);
|
|
|
|
len = snprintf(path, sizeof example_sockaddr_un.sun_path,
|
|
"%s/%s", xdg_runtime_dir, name);
|
|
assert(len < sizeof example_sockaddr_un.sun_path
|
|
&& "Bug in test. Path too long");
|
|
|
|
/* was the socket? */
|
|
assert(access(path, F_OK) != -1);
|
|
|
|
/* is the name sequential? */
|
|
len = snprintf(path, sizeof example_sockaddr_un.sun_path,
|
|
"wayland-%d", i);
|
|
assert(strcmp(name, path) == 0);
|
|
}
|
|
|
|
/* next addition should return NULL */
|
|
name = wl_display_add_socket_auto(d);
|
|
assert(name == NULL);
|
|
|
|
/* check if the socket was not deleted the last time */
|
|
name = wl_display_add_socket_auto(d);
|
|
assert(name == NULL);
|
|
|
|
wl_display_destroy(d);
|
|
}
|