ALSA: hda: fix a possible null-pointer dereference due to data race in snd_hdac_regmap_sync()
PATCH 1/1 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().
--- sound/hda/hdac_regmap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
sound/hda/hdac_regmap.c +3 -4
@@ -597,10 +597,9 @@ EXPORT_SYMBOL_GPL(snd_hdac_regmap_update_raw_once);*/ void snd_hdac_regmap_sync (struct hdac_device *codec) { -if (codec->regmap) { -mutex_lock (&codec->regmap_lock); +mutex_lock (&codec->regmap_lock); +if (codec->regmap)regcache_sync (codec->regmap); -mutex_unlock (&codec->regmap_lock); - } +mutex_unlock (&codec->regmap_lock); }EXPORT_SYMBOL_GPL (snd_hdac_regmap_sync);
Signature · 1 line
2.34.1
Quoted 11 lines · Tuo Li
The variable
codec->regmapis often protected by the lockcodec->regmap_lockwhen is accessed. However, it is accessed without holding the lock when is accessed insnd_hdac_regmap_sync():if (
codec->regmap)In my opinion, this may be a harmful race, because if
codec->regmapis set to NULL right after the condition is checked, a null-pointer dereference can occur in the called functionregcache_sync():
Quoted 8 lines
map->lock(map->lock_arg); --> Line 360 indrivers/base/regmap/regcache.cTo fix this possible null-pointer dereference caused by data race, the
mutex_lockcoverage is extended to protect the if statement as well as the function call toregcache_sync().Reported-by BassCheck <[email protected]>Signed-off-by Tuo Li <[email protected]>
Practically seen, it's pretty harmless, as the flag is set at the very beginning of the codec driver probe, while snd_hdac_regmap_sync() is used only in the runtime PM resume that must not happen during the probe. IOW, codec->regmap_lock itself isn't really meant to protectthe change of codec->regmap flag.
OTOH, your change makes things more consistent, so I applied the patch now.
Thanks!
Takashi
Quoted 25 lines
--- sound/hda/hdac_regmap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)sound/hda/hdac_regmap.c +3
-4@@ -597,10 +597,9 @@ EXPORT_SYMBOL_GPL(snd_hdac_regmap_update_raw_once);*/ void snd_hdac_regmap_sync (struct hdac_device *codec) { -if (codec->regmap) { -mutex_lock (&codec->regmap_lock); +mutex_lock (&codec->regmap_lock); +if (codec->regmap)regcache_sync (codec->regmap); -mutex_unlock (&codec->regmap_lock); - } +mutex_unlock (&codec->regmap_lock); }EXPORT_SYMBOL_GPL (snd_hdac_regmap_sync);Signature · 1 line
2.34.1
Thanks for your reply!
Best regards,
Tuo Li
Quoted 65 lines · Takashi Iwai
Quoted 5 lines · Tuo Li
The variable
codec->regmapis often protected by the lockcodec->regmap_lockwhen is accessed. However, it is accessed without holding the lock when is accessed insnd_hdac_regmap_sync():Quoted 7 lines
if (
codec->regmap)In my opinion, this may be a harmful race, because if
codec->regmapis set to NULL right after the condition is checked, a null-pointer dereference can occur in the called functionregcache_sync():
map->lock(map->lock_arg); --> Line 360 in
drivers/base/regmap/regcache.cQuoted 3 lines
To fix this possible null-pointer dereference caused by data race, the
mutex_lockcoverage is extended to protect the if statement as well asthe
Quoted 4 lines
function call to
regcache_sync().Reported-by BassCheck <[email protected]>Signed-off-by Tuo Li <[email protected]>Practically seen, it's pretty harmless, as the flag is set at the very beginning of the codec driver probe, while
snd_hdac_regmap_sync()is used only in the runtime PM resume that must not happen during the probe. IOW,codec->regmap_lockitself isn't really meant to protectthe change ofcodec->regmapflag.OTOH, your change makes things more consistent, so I applied the patch now.
Thanks!
Takashi
Quoted 25 lines
--- sound/hda/hdac_regmap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)sound/hda/hdac_regmap.c +3
-5@@ -597,10 +597,9 @@ EXPORT_SYMBOL_GPL(snd_hdac_regmap_update_raw_once);*/ void snd_hdac_regmap_sync (struct hdac_device *codec) { -if (codec->regmap) { -mutex_lock (&codec->regmap_lock); +mutex_lock (&codec->regmap_lock); +if (codec->regmap)regcache_sync (codec->regmap); -mutex_unlock (&codec->regmap_lock); - } +mutex_unlock (&codec->regmap_lock); }EXPORT_SYMBOL_GPL (snd_hdac_regmap_sync); --2.34.1