mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

srbchannel: Introduce per-client SHM files

Browse source 
The PA daemon currently uses a single SHM file for all clients
sending and receiving commands over the low-latency srbchannel
mechanism.

To avoid leaks between clients in that case, and to provide the
necessary ground work later for sandboxing and memfds, create the
srbchannel SHM files on a per-client basis.

Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
This commit is contained in:
Ahmed S. Darwish 2016-03-13 00:53:34 +02:00 • committed by David Henningsson
parent 9bda6e344a
commit 211a520543
3 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/pulsecore/protocol-native.c
View file

@ -173,6 +173,12 @@ struct pa_native_connection {
bool is_local:1;
uint32_t version;
pa_client *client;
/* R/W mempool, one per client connection, for srbchannel transport.
* Both server and client can write to this shm area.
*
* Note: This will be NULL if our connection with the client does
* not support srbchannels */
pa_mempool *rw_mempool;
pa_pstream *pstream;
pa_pdispatch *pdispatch;
pa_idxset *record_streams, *output_streams;
@ -1371,6 +1377,9 @@ static void native_connection_free(pa_object *o) {
pa_pdispatch_unref(c->pdispatch);
pa_pstream_unref(c->pstream);
if (c->rw_mempool)
pa_mempool_unref(c->rw_mempool);
pa_client_free(c->client);
pa_xfree(c);
@ -2606,14 +2615,25 @@ static void setup_srbchannel(pa_native_connection *c) {
return;
}
if (!c->protocol->core->rw_mempool) {
pa_log_debug("Disabling srbchannel, reason: No rw memory pool");
if (c->rw_mempool) {
pa_log_debug("Ignoring srbchannel setup, reason: received COMMAND_AUTH "
"more than once");
return;
}
srb = pa_srbchannel_new(c->protocol->core->mainloop, c->protocol->core->rw_mempool);
if (!(c->rw_mempool = pa_mempool_new(true, c->protocol->core->shm_size))) {
pa_log_warn("Disabling srbchannel, reason: Failed to allocate shared "
"writable memory pool.");
return;
}
pa_mempool_set_is_remote_writable(c->rw_mempool, true);
srb = pa_srbchannel_new(c->protocol->core->mainloop, c->rw_mempool);
if (!srb) {
pa_log_debug("Failed to create srbchannel");
pa_mempool_unref(c->rw_mempool);
c->rw_mempool = NULL;
return;
}
pa_log_debug("Enabling srbchannel...");
@ -5125,6 +5145,8 @@ void pa_native_protocol_connect(pa_native_protocol *p, pa_iochannel *io, pa_nati
c->client->send_event = client_send_event_cb;
c->client->userdata = c;
c->rw_mempool = NULL;
c->pstream = pa_pstream_new(p->core->mainloop, io, p->core->mempool);
pa_pstream_set_receive_packet_callback(c->pstream, pstream_packet_callback, c);
pa_pstream_set_receive_memblock_callback(c->pstream, pstream_memblock_callback, c);