mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2026-05-03 06:47:04 -04:00
security: add per-client stream limit in PulseAudio protocol
There was no limit on the number of streams a single client could create. Each stream allocates a 4MB ring buffer, allowing a malicious client to exhaust server memory. Add a configurable pulse.max-streams property (default 64) to limit streams per client. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
parent
80ec1f1d10
commit
37990b5e90
7 changed files with 18 additions and 1 deletions
|
|
@ -119,6 +119,7 @@ pulse.properties = {
|
||||||
#pulse.default.tlength = 96000/48000 # 2 seconds
|
#pulse.default.tlength = 96000/48000 # 2 seconds
|
||||||
#pulse.min.quantum = 256/48000 # 5.3ms
|
#pulse.min.quantum = 256/48000 # 5.3ms
|
||||||
#pulse.idle.timeout = 0 # don't pause after underruns
|
#pulse.idle.timeout = 0 # don't pause after underruns
|
||||||
|
#pulse.max-streams = 64 # max streams per client
|
||||||
#pulse.default.format = F32
|
#pulse.default.format = F32
|
||||||
#pulse.default.position = [ FL FR ]
|
#pulse.default.position = [ FL FR ]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -76,6 +76,7 @@
|
||||||
* #pulse.default.format = F32
|
* #pulse.default.format = F32
|
||||||
* #pulse.default.position = [ FL FR ]
|
* #pulse.default.position = [ FL FR ]
|
||||||
* #pulse.idle.timeout = 0
|
* #pulse.idle.timeout = 0
|
||||||
|
* #pulse.max-streams = 64
|
||||||
* }
|
* }
|
||||||
*
|
*
|
||||||
* pulse.properties.rules = [
|
* pulse.properties.rules = [
|
||||||
|
|
@ -247,6 +248,12 @@
|
||||||
* save battery power. When the client resumes, it will unpause again.
|
* save battery power. When the client resumes, it will unpause again.
|
||||||
* A value of 0 disables this feature.
|
* A value of 0 disables this feature.
|
||||||
*
|
*
|
||||||
|
*\code{.unparsed}
|
||||||
|
* pulse.max-streams = 64
|
||||||
|
*\endcode
|
||||||
|
*
|
||||||
|
* The maximum number of streams a single client can create. Default is 64.
|
||||||
|
*
|
||||||
* ## Command execution
|
* ## Command execution
|
||||||
*
|
*
|
||||||
* As part of the server startup sequence, a set of commands can be executed.
|
* As part of the server startup sequence, a set of commands can be executed.
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,9 @@
|
||||||
|
|
||||||
#define SCACHE_ENTRY_SIZE_MAX (1024*1024*16)
|
#define SCACHE_ENTRY_SIZE_MAX (1024*1024*16)
|
||||||
|
|
||||||
|
#define MAX_CLIENTS 64u
|
||||||
|
#define MAX_STREAMS 64u
|
||||||
|
|
||||||
#define MODULE_INDEX_MASK 0xfffffffu
|
#define MODULE_INDEX_MASK 0xfffffffu
|
||||||
#define MODULE_FLAG (1u << 29)
|
#define MODULE_FLAG (1u << 29)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,7 @@ struct defs {
|
||||||
struct channel_map channel_map;
|
struct channel_map channel_map;
|
||||||
uint32_t quantum_limit;
|
uint32_t quantum_limit;
|
||||||
uint32_t idle_timeout;
|
uint32_t idle_timeout;
|
||||||
|
uint32_t max_streams;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct stats {
|
struct stats {
|
||||||
|
|
|
||||||
|
|
@ -5605,6 +5605,7 @@ static void load_defaults(struct defs *def, struct pw_properties *props)
|
||||||
parse_format(props, "pulse.default.format", DEFAULT_FORMAT, &def->sample_spec);
|
parse_format(props, "pulse.default.format", DEFAULT_FORMAT, &def->sample_spec);
|
||||||
parse_position(props, "pulse.default.position", DEFAULT_POSITION, &def->channel_map);
|
parse_position(props, "pulse.default.position", DEFAULT_POSITION, &def->channel_map);
|
||||||
parse_uint32(props, "pulse.idle.timeout", DEFAULT_IDLE_TIMEOUT, &def->idle_timeout);
|
parse_uint32(props, "pulse.idle.timeout", DEFAULT_IDLE_TIMEOUT, &def->idle_timeout);
|
||||||
|
parse_uint32(props, "pulse.max-streams", SPA_STRINGIFY(MAX_STREAMS), &def->max_streams);
|
||||||
def->sample_spec.channels = def->channel_map.channels;
|
def->sample_spec.channels = def->channel_map.channels;
|
||||||
def->quantum_limit = 8192;
|
def->quantum_limit = 8192;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,6 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define LISTEN_BACKLOG 32
|
#define LISTEN_BACKLOG 32
|
||||||
#define MAX_CLIENTS 64
|
|
||||||
|
|
||||||
PW_LOG_TOPIC_EXTERN(pulse_conn);
|
PW_LOG_TOPIC_EXTERN(pulse_conn);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -63,6 +63,11 @@ struct stream *stream_new(struct client *client, enum stream_type type, uint32_t
|
||||||
struct defs *defs = &client->impl->defs;
|
struct defs *defs = &client->impl->defs;
|
||||||
const char *str;
|
const char *str;
|
||||||
|
|
||||||
|
if (pw_map_get_size(&client->streams) >= defs->max_streams) {
|
||||||
|
errno = ENOSPC;
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
struct stream *stream = calloc(1, sizeof(*stream));
|
struct stream *stream = calloc(1, sizeof(*stream));
|
||||||
if (stream == NULL)
|
if (stream == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue