Skip to contentSkip to conversation

ALSA: soc-cache: dereferencing before checking

PATCH Applied Dan Carpenter 4 participants 4 messages Feb 7, 2011 – Feb 8, 2011

Subsystems (3)
Sound Kernel janitors ASoC
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 ALSA: soc-cache: dereferencing before checking

The patch c358e640a66 "ASoC: soc-cache: Add trace event for snd_soc_cache_sync()" introduced a dereference of "codec->cache_ops" before we had checked it for NULL.

I pulled the check forward, and then pulled everything in an indent level.

Signed-off-by Dan Carpenter <[email protected]>
sound/soc/soc-cache.c +12 -13
index db66dc4..5d76da4 100644
@@ -1609,24 +1609,23 @@ int snd_soc_cache_sync(struct snd_soc_codec *codec)
 		return 0;
 	}
 
+	if (!codec->cache_ops || !codec->cache_ops->sync)
+		return -EINVAL;
+
 	if (codec->cache_ops->name)
 		name = codec->cache_ops->name;
 	else
 		name = "unknown";
 
-	if (codec->cache_ops && codec->cache_ops->sync) {
-		if (codec->cache_ops->name)
-			dev_dbg(codec->dev, "Syncing %s cache for %s codec\n",
-				codec->cache_ops->name, codec->name);
-		trace_snd_soc_cache_sync(codec, name, "start");
-		ret = codec->cache_ops->sync(codec);
-		if (!ret)
-			codec->cache_sync = 0;
-		trace_snd_soc_cache_sync(codec, name, "end");
-		return ret;
-	}
-
-	return -EINVAL;
+	if (codec->cache_ops->name)
+		dev_dbg(codec->dev, "Syncing %s cache for %s codec\n",
+			codec->cache_ops->name, codec->name);
+	trace_snd_soc_cache_sync(codec, name, "start");
+	ret = codec->cache_ops->sync(codec);
+	if (!ret)
+		codec->cache_sync = 0;
+	trace_snd_soc_cache_sync(codec, name, "end");
+	return ret;
 }
 EXPORT_SYMBOL_GPL(snd_soc_cache_sync);
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Dan Carpenter

The patch c358e640a66 "ASoC: soc-cache: Add trace event for snd_soc_cache_sync()" introduced a dereference of "codec->cache_ops" before we had checked it for NULL.

I pulled the check forward, and then pulled everything in an indent level.

Signed-off-by Dan Carpenter <[email protected]>
Acked-by Liam Girdwood <[email protected]>
Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
#2 lore raw
In reply to Dan Carpenter
Quoted 8 lines · Dan Carpenter

The patch c358e640a66 "ASoC: soc-cache: Add trace event for snd_soc_cache_sync()" introduced a dereference of "codec->cache_ops" before we had checked it for NULL.

I pulled the check forward, and then pulled everything in an indent level.

Signed-off-by Dan Carpenter <[email protected]>

Dah, thanks for catching this.

Dimitris

Applied
#3 lore raw
In reply to Dan Carpenter
Quoted 3 lines · Dan Carpenter

The patch c358e640a66 "ASoC: soc-cache: Add trace event for snd_soc_cache_sync()" introduced a dereference of "codec->cache_ops" before we had checked it for NULL.

Applied, thanks. Please try to use subject lines for your patches which are consistent with the subsystem you're submitting to.