upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sound: Wrap dsp_clone() and mixer_clone() with bus_topo_lock()

Browse source 
Make sure that the softc isn't freed in between the checks.

Sponsored by:	The FreeBSD Foundation
MFC after;	1 day
Reviewed by:	markj
Differential Revision:	https://reviews.freebsd.org/D44991
This commit is contained in:
Christos Margiolis 2024-04-28 21:40:29 +02:00
parent 074d6fbebc
commit b18b990d8e
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/dev/sound/pcm/dsp.c
View file

@ -2085,6 +2085,7 @@ dsp_clone(void *arg, struct ucred *cred, char *name, int namelen,
}
return;
found:
bus_topo_lock();
d = devclass_get_softc(pcm_devclass, snd_unit);
/*
* If we only have a single soundcard attached and we detach it right
@ -2096,6 +2097,7 @@ found:
*dev = d->dsp_dev;
dev_ref(*dev);
}
bus_topo_unlock();
}
static void

2
sys/dev/sound/pcm/mixer.c
View file

@ -1377,12 +1377,14 @@ mixer_clone(void *arg,
if (*dev != NULL)
return;
if (strcmp(name, "mixer") == 0) {
bus_topo_lock();
d = devclass_get_softc(pcm_devclass, snd_unit);
/* See related comment in dsp_clone(). */
if (d != NULL && PCM_REGISTERED(d) && d->mixer_dev != NULL) {
*dev = d->mixer_dev;
dev_ref(*dev);
}
bus_topo_unlock();
}
}