mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'strict-message-size' into 'main'

Browse source 
Require messages to use as few bytes as possible

See merge request wayland/wayland!416
This commit is contained in:
Demi Marie Obenour 2025-09-19 01:46:37 -04:00
commit 9042d20aca
3 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
doc/publican/sources/Protocol.xml
View file

@ -112,8 +112,11 @@
</listitem>
<listitem>
<para>
The second has 2 parts of 16-bit. The upper 16-bits are the message
size in bytes, starting at the header (i.e. it has a minimum value of 8).The lower is the request/event opcode.
The second has 2 parts of 16 bits each. The upper 16 bits are the message
size in bytes, starting at the header (i.e. it has a minimum value of 8).
The lower is the request/event opcode. The size must be a multiple of 4.
Messages must be sent using the fewest bytes possible, so padding after
the end of a message is not permitted.
</para>
</listitem>
</itemizedlist>

15
src/connection.c
View file

@ -904,7 +904,14 @@ wl_connection_demarshal(struct wl_connection *connection,
/* Space for sender_id and opcode */
if (size < 2 * sizeof *p) {
wl_log("message too short, invalid header\n");
wl_log("message length %" PRIu32 " too short, invalid header\n", size);
wl_connection_consume(connection, size);
errno = EINVAL;
return NULL;
}
if (size % sizeof *p) {
wl_log("message length %" PRIu32 " invalid, not multiple of 4 bytes", size);
wl_connection_consume(connection, size);
errno = EINVAL;
return NULL;
@ -1072,6 +1079,12 @@ wl_connection_demarshal(struct wl_connection *connection,
}
}
if (p != end) {
wl_log("trailing junk\n");
errno = EINVAL;
goto err;
}
wl_connection_consume(connection, size);
return closure;

9
src/wayland-server.c
View file

@ -424,6 +424,15 @@ wl_client_connection_data(int fd, uint32_t mask, void *data)
if (len < size)
break;
if ((size & 3) != 0) {
/* Post a better error than "invalid arguments" */
wl_resource_post_error(client->display_resource,
WL_DISPLAY_ERROR_INVALID_METHOD,
"message length %u is not multiple of 4",
size);
break;
}
resource = wl_map_lookup(&client->objects, p[0]);
resource_flags = wl_map_lookup_flags(&client->objects, p[0]);
if (resource == NULL) {