Re: [PATCH weston 1/3] tests: add a test causing SIGBUS to the compositor

2013-11-21 Thread Kristian Høgsberg
On Thu, Nov 21, 2013 at 04:23:56PM +0200, ppaala...@gmail.com wrote:
> From: Pekka Paalanen 
> 
> This tests the wl_shm buffer access wrappers, that are supposed to catch
> the invalid accesses to a memory-mapped file beyond EOF.

Good testcase, thanks.  All three patches applied.

Kristian

> Signed-off-by: Pekka Paalanen 
> ---
>  tests/Makefile.am   |  4 +++
>  tests/bad-client-test.c | 77 
> +
>  2 files changed, 81 insertions(+)
>  create mode 100644 tests/bad-client-test.c
> 
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 8e08375..b03c5b8 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -11,6 +11,7 @@ module_tests =  \
>  weston_test = weston-test.la
>  
>  weston_tests =   \
> + bad_client.weston   \
>   keyboard.weston \
>   event.weston\
>   button.weston   \
> @@ -97,6 +98,9 @@ weston_test_client_libs =   \
>   ../shared/libshared.la  \
>   libshared-test.la
>  
> +bad_client_weston_SOURCES = bad-client-test.c $(weston_test_client_src)
> +bad_client_weston_LDADD = $(weston_test_client_libs)
> +
>  keyboard_weston_SOURCES = keyboard-test.c $(weston_test_client_src)
>  keyboard_weston_LDADD = $(weston_test_client_libs)
>  
> diff --git a/tests/bad-client-test.c b/tests/bad-client-test.c
> new file mode 100644
> index 000..4f5f810
> --- /dev/null
> +++ b/tests/bad-client-test.c
> @@ -0,0 +1,77 @@
> +/*
> + * Copyright © 2012 Intel Corporation
> + * Copyright © 2013 Collabora, Ltd.
> + *
> + * 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 
> +#include 
> +
> +#include "../shared/os-compatibility.h"
> +#include "weston-test-client-helper.h"
> +
> +/* tests, that attempt to crash the compositor on purpose */
> +
> +static struct wl_buffer *
> +create_bad_shm_buffer(struct client *client, int width, int height)
> +{
> + struct wl_shm *shm = client->wl_shm;
> + int stride = width * 4;
> + int size = stride * height;
> + struct wl_shm_pool *pool;
> + struct wl_buffer *buffer;
> + int fd;
> +
> + fd = os_create_anonymous_file(size);
> + assert(fd >= 0);
> +
> + pool = wl_shm_create_pool(shm, fd, size);
> + buffer = wl_shm_pool_create_buffer(pool, 0, width, height, stride,
> +WL_SHM_FORMAT_ARGB);
> + wl_shm_pool_destroy(pool);
> +
> + /* Truncate the file to a small size, so that the compositor
> +  * will access it out-of-bounds, and hit SIGBUS.
> +  */
> + assert(ftruncate(fd, 12) == 0);
> + close(fd);
> +
> + return buffer;
> +}
> +
> +FAIL_TEST(test_truncated_shm_file)
> +{
> + struct client *client;
> + struct wl_buffer *bad_buffer;
> + struct wl_surface *surface;
> + int frame;
> +
> + client = client_create(46, 76, 111, 134);
> + assert(client);
> + surface = client->surface->wl_surface;
> +
> + bad_buffer = create_bad_shm_buffer(client, 200, 200);
> +
> + wl_surface_attach(surface, bad_buffer, 0, 0);
> + wl_surface_damage(surface, 0, 0, 200, 200);
> + frame_callback_set(surface, &frame);
> + wl_surface_commit(surface);
> + frame_callback_wait(client, &frame);
> +}
> -- 
> 1.8.1.5
> 
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel


Re: [PATCH weston 1/3] tests: add a test causing SIGBUS to the compositor

2013-11-21 Thread Daniel Stone
Hi,

On 21 November 2013 14:23,   wrote:
>  weston_tests = \
> +   bad_client.weston   \
> keyboard.weston \
> event.weston\
> button.weston   \

I think this would be much better called shm-sigbus or something,
given a lot of the tests try to simulate abusive clients. :)

Cheers,
Daniel
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel