sound: Add missing CHN_[UN]LOCKs in sndstat
ClosedPublic
Actions

Authored by christos on Jul 6 2024, 3:05 PM.

Details

Reviewers

markj
emaste
dev_submerge.ch

Commits

rGfab137d23462: sound: Add missing CHN_[UN]LOCKs in sndstat
rGe850bd36dfda: sound: Add missing CHN_[UN]LOCKs in sndstat

Summary

For sndstat_build_sound4_nvlist(), if we have INVARIANTS or
SND_DIAGNOSTIC enabled, we will hit an lock assertion panic when we call
CHN_GETVOLUME(). Also lock the channel in the sndstat_prepare_pcm() loop
for good measure.

Fixes: bbca3a75bb41 ("sound: Include sound(4) channel information in sndstat nvlist")
Sponsored by: The FreeBSD Foundation
MFC after: 2 days

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

christos created this revision.Jul 6 2024, 3:05 PM

Herald added a subscriber: imp. · View Herald TranscriptJul 6 2024, 3:05 PM

christos requested review of this revision.Jul 6 2024, 3:05 PM

Harbormaster completed remote builds in B58537: Diff 140621.Jul 6 2024, 3:05 PM

christos mentioned this in D45872: sound: Refactor sndstat_get_caps().Jul 6 2024, 3:06 PM

This fixes the panic for me, thank you.

This revision is now accepted and ready to land.Jul 6 2024, 3:56 PM

Closed by commit rGe850bd36dfda: sound: Add missing CHN_[UN]LOCKs in sndstat (authored by christos). · Explain WhyJul 6 2024, 6:24 PM

This revision was automatically updated to reflect the committed changes.

christos added a commit: rGe850bd36dfda: sound: Add missing CHN_[UN]LOCKs in sndstat.

christos added a commit: rGfab137d23462: sound: Add missing CHN_[UN]LOCKs in sndstat.Jul 10 2024, 4:49 PM

Revision Contents
Changeset List

Path

Size

sys/

dev/

sound/

pcm/

sndstat.c

8 lines

Diff 140644

View Options

sys/dev/sound/pcm/sndstat.c

sound: Add missing CHN_[UN]LOCKs in sndstatClosedPublicActions