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

security: fix OOB read in netjack2 MIDI buffer parsing

Browse source 
Validate that the midi buffer metadata fits within the buffer size
before computing the offset, preventing a size_t underflow. Also
bounds-check non-inline event data pointers against the validated
buffer region.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Wim Taymans 2026-04-29 12:30:37 +02:00
parent 0186bccdce
commit 3a77f9c28a
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/modules/module-netjack2/peer.c
View file

@ -365,26 +365,35 @@ static inline void netjack2_to_midi(float *dst, uint32_t size, struct nj2_midi_b
struct spa_pod_builder b = { 0, }; struct spa_pod_builder b = { 0, };
uint32_t i; uint32_t i;
struct spa_pod_frame f; struct spa_pod_frame f;
size_t offset = size - buf->write_pos - sizeof(*buf) - size_t used = sizeof(*buf) +
(buf->event_count * sizeof(struct nj2_midi_event)); (buf->event_count * sizeof(struct nj2_midi_event)) +
buf->write_pos;
spa_pod_builder_init(&b, dst, size); spa_pod_builder_init(&b, dst, size);
spa_pod_builder_push_sequence(&b, &f, 0); spa_pod_builder_push_sequence(&b, &f, 0);
if (used > size)
goto done;
size_t offset = size - used;
for (i = 0; i < buf->event_count; i++) { for (i = 0; i < buf->event_count; i++) {
struct nj2_midi_event *ev = &buf->event[i]; struct nj2_midi_event *ev = &buf->event[i];
uint8_t *data; uint8_t *data;
if (ev->size <= MIDI_INLINE_MAX) if (ev->size <= MIDI_INLINE_MAX) {
data = ev->buffer; data = ev->buffer;
else if (ev->offset > offset) } else if (ev->offset > offset &&
ev->offset - offset + ev->size <= used) {
data = SPA_PTROFF(buf, ev->offset - offset, void); data = SPA_PTROFF(buf, ev->offset - offset, void);
else } else {
continue; continue;
}
spa_pod_builder_control(&b, ev->time, SPA_CONTROL_Midi); spa_pod_builder_control(&b, ev->time, SPA_CONTROL_Midi);
spa_pod_builder_bytes(&b, data, ev->size); spa_pod_builder_bytes(&b, data, ev->size);
} }
done:
spa_pod_builder_pop(&b, &f); spa_pod_builder_pop(&b, &f);
} }