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

milan-avb: move teh descriptor FAM at the end of the structure to avoid overflow

Browse source
This commit is contained in:
hackerman-kl 2026-04-26 13:03:10 +02:00 • committed by Wim Taymans
parent 4d33f57325
commit 0bf4864d84
14 changed files with 126 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/modules/module-avb/internal.h
View file

@ -67,9 +67,15 @@ struct descriptor {
uint16_t type;
uint16_t index;
uint32_t size;
uint32_t state_size;
void *ptr;
};
static inline void *descriptor_body(const struct descriptor *d)
{
return SPA_PTROFF(d->ptr, d->state_size, void);
}
enum avb_mode {
/** The legacy AVB Mode */
@ -142,20 +148,24 @@ static inline struct descriptor *server_find_descriptor(struct server *server,
}
return NULL;
}
static inline void *server_add_descriptor(struct server *server,
uint16_t type, uint16_t index, size_t size, void *ptr)
static inline struct descriptor *server_add_descriptor(struct server *server,
uint16_t type, uint16_t index,
size_t state_size, size_t desc_size, const void *desc_ptr)
{
struct descriptor *d;
if ((d = calloc(1, sizeof(struct descriptor) + size)) == NULL)
if ((d = calloc(1, sizeof(*d) + state_size + desc_size)) == NULL) {
return NULL;
}
d->type = type;
d->index = index;
d->size = size;
d->ptr = SPA_PTROFF(d, sizeof(struct descriptor), void);
if (ptr)
memcpy(d->ptr, ptr, size);
d->size = desc_size;
d->state_size = state_size;
d->ptr = SPA_PTROFF(d, sizeof(*d), void);
if (desc_ptr) {
memcpy(SPA_PTROFF(d->ptr, state_size, void), desc_ptr, desc_size);
}
spa_list_append(&server->descriptors, &d->link);
return d;
}