mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-04-29 06:46:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: add spa_alloca that does overflow and limit checks

Browse source 
Make a function like alloca but with overflow checks and a max
allocation size.

Use this function where we can and also make sure that all alloca calls
are in some way limited.
This commit is contained in:
Wim Taymans 2026-04-27 10:53:44 +02:00
parent a9f1ad414e
commit ed2c0ad4ee
10 changed files with 84 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/module-protocol-pulse/defs.h
View file

@ -34,6 +34,9 @@
#define MAXLENGTH (4u*1024*1024) /* 4MB */
/* pulseaudio has a 128 char limit for this but we can allow more */
#define MAX_NAME 1024u
#define SCACHE_ENTRY_SIZE_MAX (1024*1024*16)
#define MODULE_INDEX_MASK 0xfffffffu

7
src/modules/module-protocol-pulse/message.c
View file

@ -532,12 +532,13 @@ static void add_stream_group(struct message *m, struct spa_dict *dict, const cha
else
return;
write_string(m, key);
l = strlen(prefix) + strlen(id) + strlen(str) + 6; /* "-by-" , ":" and \0 */
if (l < 0 || l > 1024)
if (l < 0 || l > 4096)
return;
write_string(m, key);
b = alloca(l);
snprintf(b, l, "%s-by-%s:%s", prefix, id, str);
spa_scnprintf(b, l, "%s-by-%s:%s", prefix, id, str);
write_u32(m, l);
write_arbitrary(m, b, l);
}

55
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -753,8 +753,11 @@ static int reply_create_record_stream(struct stream *stream, struct pw_manager_o
peer_index = peer->index;
if (!pw_manager_object_is_source(peer)) {
size_t len = (name ? strlen(name) : 5) + 10;
peer_name = tmp = alloca(len);
snprintf(tmp, len, "%s.monitor", name ? name : "sink");
if (len <= MAX_NAME) {
peer_name = tmp = alloca(len);
spa_scnprintf(tmp, len, "%s.monitor", name ? name : "sink");
} else
peer_name = NULL;
} else {
peer_name = name;
}
@ -866,7 +869,7 @@ static void manager_added(void *data, struct pw_manager_object *o)
size_t len = strlen(peer_name) + 10;
if (len <= 1024) {
char *tmp = alloca(len);
snprintf(tmp, len, "%s.monitor", peer_name);
spa_scnprintf(tmp, len, "%s.monitor", peer_name);
peer_name = tmp;
}
}
@ -3174,9 +3177,8 @@ static int do_set_port_latency_offset(struct client *client, uint32_t command, u
return -ENOENT;
collect_card_info(card, &card_info);
if (card_info.n_ports > MAX_ALLOCA_SIZE / sizeof(*port_info))
return -ENOMEM;
port_info = alloca(card_info.n_ports * sizeof(*port_info));
if ((port_info = spa_alloca(card_info.n_ports, sizeof(*port_info), MAX_ALLOCA_SIZE)) == NULL)
return -errno;
card_info.active_profile = SPA_ID_INVALID;
n_ports = collect_port_info(card, &card_info, NULL, port_info);
@ -3315,9 +3317,9 @@ static int do_remove_proplist(struct client *client, uint32_t command, uint32_t
}
dict.n_items = props->dict.n_items;
if (dict.n_items > MAX_ALLOCA_SIZE / sizeof(struct spa_dict_item))
return -ENOMEM;
dict.items = items = alloca(sizeof(struct spa_dict_item) * dict.n_items);
if ((dict.items = items = spa_alloca(dict.n_items,
sizeof(struct spa_dict_item), MAX_ALLOCA_SIZE)) == NULL)
return -errno;
for (i = 0; i < dict.n_items; i++) {
items[i].key = props->dict.items[i].key;
items[i].value = NULL;
@ -3600,9 +3602,8 @@ static int fill_card_info(struct client *client, struct message *m,
TAG_U32, card_info.n_profiles, /* n_profiles */
TAG_INVALID);
if (card_info.n_profiles > MAX_ALLOCA_SIZE / sizeof(*profile_info))
return -ENOMEM;
profile_info = alloca(card_info.n_profiles * sizeof(*profile_info));
if ((profile_info = spa_alloca(card_info.n_profiles, sizeof(*profile_info), MAX_ALLOCA_SIZE)) == NULL)
return -errno;
n_profiles = collect_profile_info(o, &card_info, profile_info);
for (n = 0; n < n_profiles; n++) {
@ -3631,9 +3632,8 @@ static int fill_card_info(struct client *client, struct message *m,
uint32_t n_ports;
struct port_info *port_info, *pi;
if (card_info.n_ports > MAX_ALLOCA_SIZE / sizeof(*port_info))
return -ENOMEM;
port_info = alloca(card_info.n_ports * sizeof(*port_info));
if ((port_info = spa_alloca(card_info.n_ports, sizeof(*port_info), MAX_ALLOCA_SIZE)) == NULL)
return -errno;
card_info.active_profile = SPA_ID_INVALID;
n_ports = collect_port_info(o, &card_info, NULL, port_info);
@ -3649,8 +3649,7 @@ static int fill_card_info(struct client *client, struct message *m,
pi = &port_info[n];
if (pi->info && pi->n_props > 0 &&
pi->n_props <= MAX_ALLOCA_SIZE / sizeof(*items)) {
items = alloca(pi->n_props * sizeof(*items));
(items = spa_alloca(pi->n_props, sizeof(*items), MAX_ALLOCA_SIZE)) != NULL) {
dict.items = items;
pdict = collect_props(pi->info, &dict);
}
@ -3757,7 +3756,7 @@ static int fill_sink_info(struct client *client, struct message *m,
if (name == NULL)
name = "unknown";
size = strlen(name) + 10;
size = SPA_MIN(strlen(name) + 10, MAX_NAME);
monitor_name = alloca(size);
if (pw_manager_object_is_source(o))
snprintf(monitor_name, size, "%s", name);
@ -3838,9 +3837,8 @@ static int fill_sink_info(struct client *client, struct message *m,
uint32_t n_ports, n;
struct port_info *port_info, *pi;
if (card_info.n_ports > MAX_ALLOCA_SIZE / sizeof(*port_info))
return -ENOMEM;
port_info = alloca(card_info.n_ports * sizeof(*port_info));
if ((port_info = spa_alloca(card_info.n_ports, sizeof(*port_info), MAX_ALLOCA_SIZE)) == NULL)
return -errno;
n_ports = collect_port_info(card, &card_info, &dev_info, port_info);
message_put(m,
@ -3956,11 +3954,11 @@ static int fill_source_info(struct client *client, struct message *m,
if (name == NULL)
name = "unknown";
size = strlen(name) + 10;
size = SPA_MIN(strlen(name) + 10, MAX_NAME);
monitor_name = alloca(size);
snprintf(monitor_name, size, "%s.monitor", name);
size = strlen(desc) + 20;
size = SPA_MIN(strlen(desc) + 20, MAX_NAME);
monitor_desc = alloca(size);
snprintf(monitor_desc, size, "Monitor of %s", desc);
@ -4036,9 +4034,8 @@ static int fill_source_info(struct client *client, struct message *m,
uint32_t n_ports, n;
struct port_info *port_info, *pi;
if (card_info.n_ports > MAX_ALLOCA_SIZE / sizeof(*port_info))
return -ENOMEM;
port_info = alloca(card_info.n_ports * sizeof(*port_info));
if ((port_info = spa_alloca(card_info.n_ports, sizeof(*port_info), MAX_ALLOCA_SIZE)) == NULL)
return -errno;
n_ports = collect_port_info(card, &card_info, &dev_info, port_info);
message_put(m,
@ -4103,12 +4100,10 @@ static int fill_node_info_proplist(struct message *m, const struct spa_dict *nod
n_items += client_props->n_items;
}
if (n_items > MAX_ALLOCA_SIZE / sizeof(struct spa_dict_item))
return -ENOMEM;
if ((dict.items = items = spa_alloca(n_items, sizeof(struct spa_dict_item), MAX_ALLOCA_SIZE)) == NULL)
return -errno;
dict.n_items = n = 0;
dict.items = items = alloca(n_items * sizeof(struct spa_dict_item));
spa_dict_for_each(it, node_props)
items[n++] = *it;
dict.n_items = n;

12
src/modules/module-sendspin-recv.c
View file

@ -560,12 +560,14 @@ static int handle_server_hello(struct client *client, struct spa_json *payload)
while ((l = spa_json_object_next(payload, key, sizeof(key), &v)) > 0) {
if (spa_streq(key, "server_id")) {
t = alloca(l+1);
if ((t = spa_alloca(1, l+1, 1024)) == NULL)
return -errno;
spa_json_parse_stringn(v, l, t, l+1);
pw_properties_set(client->props, "sendspin.server-id", t);
}
else if (spa_streq(key, "name")) {
t = alloca(l+1);
if ((t = spa_alloca(1, l+1, 1024)) == NULL)
return -errno;
spa_json_parse_stringn(v, l, t, l+1);
pw_properties_set(client->props, "sendspin.server-name", t);
}
@ -579,7 +581,8 @@ static int handle_server_hello(struct client *client, struct spa_json *payload)
spa_json_enter(payload, &it[0]);
while ((l = spa_json_next(&it[0], &v)) > 0) {
t = alloca(l+1);
if ((t = spa_alloca(1, l+1, 128)) == NULL)
continue;
spa_json_parse_stringn(v, l, t, l+1);
if (spa_streq(t, "player@v1"))
@ -589,7 +592,8 @@ static int handle_server_hello(struct client *client, struct spa_json *payload)
}
}
else if (spa_streq(key, "connection_reason")) {
t = alloca(l+1);
if ((t = spa_alloca(1, l+1, 4096)) == NULL)
return -errno;
spa_json_parse_stringn(v, l, t, l+1);
if (spa_streq(t, "discovery"))

12
src/modules/module-sendspin-send.c
View file

@ -745,7 +745,8 @@ static int parse_player_v1_support(struct client *c, struct spa_json *payload)
spa_json_enter(payload, &it[0]);
while ((l = spa_json_next(&it[0], &v)) > 0) {
t = alloca(l+1);
if ((t = spa_alloca(1, l+1, 64)) == NULL)
continue;
spa_json_parse_stringn(v, l, t, l+1);
if (spa_streq(t, "volume"))
c->supported_commands |= COMMAND_VOLUME;
@ -766,12 +767,14 @@ static int handle_client_hello(struct client *c, struct spa_json *payload)
while ((l = spa_json_object_next(payload, key, sizeof(key), &v)) > 0) {
if (spa_streq(key, "client_id")) {
t = alloca(l+1);
if ((t = spa_alloca(1, l+1, 1024)) == NULL)
return -errno;
spa_json_parse_stringn(v, l, t, l+1);
pw_properties_set(c->props, "sendspin.client-id", t);
}
else if (spa_streq(key, "name")) {
t = alloca(l+1);
if ((t = spa_alloca(1, l+1, 1024)) == NULL)
return -errno;
spa_json_parse_stringn(v, l, t, l+1);
pw_properties_set(c->props, "sendspin.client-name", t);
}
@ -785,7 +788,8 @@ static int handle_client_hello(struct client *c, struct spa_json *payload)
spa_json_enter(payload, &it[0]);
while ((l = spa_json_next(&it[0], &v)) > 0) {
t = alloca(l+1);
if ((t = spa_alloca(1, l+1, 64)) == NULL)
continue;
spa_json_parse_stringn(v, l, t, l+1);
if (spa_streq(t, "player@v1"))