Skip to content

Commit e77ffdb

Browse files
lituo1996sfX-bot
authored andcommitted
ALSA: hda: fix a possible null-pointer dereference due to data race in snd_hdac_regmap_sync()
[ Upstream commit 1f4a08fed450db87fbb5ff5105354158bdbe1a22 ] 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 <[email protected]> Signed-off-by: Tuo Li <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 71fb442 commit e77ffdb

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
@@ -597,10 +597,9 @@ EXPORT_SYMBOL_GPL(snd_hdac_regmap_update_raw_once);
597597
*/
598598
void snd_hdac_regmap_sync(struct hdac_device *codec)
599599
{
600-
if (codec->regmap) {
601-
mutex_lock(&codec->regmap_lock);
600+
mutex_lock(&codec->regmap_lock);
601+
if (codec->regmap)
602602
regcache_sync(codec->regmap);
603-
mutex_unlock(&codec->regmap_lock);
604-
}
603+
mutex_unlock(&codec->regmap_lock);
605604
}
606605
EXPORT_SYMBOL_GPL(snd_hdac_regmap_sync);

0 commit comments

Comments
 (0)