Skip to content

Commit 1f4a08f

Browse files
lituo1996tiwai
authored andcommitted
ALSA: hda: fix a possible null-pointer dereference due to data race in snd_hdac_regmap_sync()
The variable codec->regmap is often protected by the lock codec->regmap_lock when is accessed. However, it is accessed without holding the lock when is accessed in snd_hdac_regmap_sync(): if (codec->regmap) In my opinion, this may be a harmful race, because if codec->regmap is set to NULL right after the condition is checked, a null-pointer dereference can occur in the called function regcache_sync(): map->lock(map->lock_arg); --> Line 360 in drivers/base/regmap/regcache.c To fix this possible null-pointer dereference caused by data race, the mutex_lock coverage is extended to protect the if statement as well as the function call to regcache_sync(). [ Note: the lack of the regmap_lock itself is harmless for the current codec driver implementations, as snd_hdac_regmap_sync() is only for PM runtime resume that is prohibited during the codec probe. But the change makes the whole code more consistent, so it's merged as is -- tiwai ] Reported-by: BassCheck <bass@buaa.edu.cn> Signed-off-by: Tuo Li <islituo@gmail.com> Link: https://lore.kernel.org/r/20230703031016.1184711-1-islituo@gmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 73f1c75 commit 1f4a08f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

sound/hda/hdac_regmap.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -596,10 +596,9 @@ EXPORT_SYMBOL_GPL(snd_hdac_regmap_update_raw_once);
596596
*/
597597
void snd_hdac_regmap_sync(struct hdac_device *codec)
598598
{
599-
if (codec->regmap) {
600-
mutex_lock(&codec->regmap_lock);
599+
mutex_lock(&codec->regmap_lock);
600+
if (codec->regmap)
601601
regcache_sync(codec->regmap);
602-
mutex_unlock(&codec->regmap_lock);
603-
}
602+
mutex_unlock(&codec->regmap_lock);
604603
}
605604
EXPORT_SYMBOL_GPL(snd_hdac_regmap_sync);

0 commit comments

Comments
 (0)