From patchwork Fri Feb 28 02:48:19 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Xiubo Li
X-Patchwork-Id: 3738451
Return-Path:
X-Original-To: patchwork-alsa-devel@patchwork.kernel.org
Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org
Received: from mail.kernel.org (mail.kernel.org [198.145.19.201])
by patchwork1.web.kernel.org (Postfix) with ESMTP id 1A8959F2F7
for ;
Fri, 28 Feb 2014 04:08:31 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
by mail.kernel.org (Postfix) with ESMTP id 0594920265
for ;
Fri, 28 Feb 2014 04:08:30 +0000 (UTC)
Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243])
by mail.kernel.org (Postfix) with ESMTP id 6158120266
for ;
Fri, 28 Feb 2014 04:08:28 +0000 (UTC)
Received: by alsa0.perex.cz (Postfix, from userid 1000)
id 533F226592E; Fri, 28 Feb 2014 05:08:27 +0100 (CET)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM,
UNPARSEABLE_RELAY,UNRESOLVED_TEMPLATE autolearn=no version=3.3.1
Received: from alsa0.perex.cz (localhost [IPv6:::1])
by alsa0.perex.cz (Postfix) with ESMTP id 253C2265090;
Fri, 28 Feb 2014 05:06:29 +0100 (CET)
X-Original-To: alsa-devel@alsa-project.org
Delivered-To: alsa-devel@alsa-project.org
Received: by alsa0.perex.cz (Postfix, from userid 1000)
id EC27026506D; Fri, 28 Feb 2014 05:06:27 +0100 (CET)
Received: from tx2outboundpool.messaging.microsoft.com
(tx2ehsobe002.messaging.microsoft.com [65.55.88.12])
by alsa0.perex.cz (Postfix) with ESMTP id 1D137265917
for ;
Fri, 28 Feb 2014 04:54:34 +0100 (CET)
Received: from mail119-tx2-R.bigfish.com (10.9.14.239) by
TX2EHSOBE001.bigfish.com (10.9.40.21) with Microsoft SMTP Server id
14.1.225.22; Fri, 28 Feb 2014 03:54:33 +0000
Received: from mail119-tx2 (localhost [127.0.0.1]) by
mail119-tx2-R.bigfish.com (Postfix) with ESMTP id 2D66E1E031F;
Fri, 28 Feb 2014 03:54:33 +0000 (UTC)
X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null);
IPV:NLI;
H:mail.freescale.net; RD:none; EFVD:NLI
X-SpamScore: 0
X-BigFish:
VS0(zzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6hzz1de098h8275bh1de097hz2dh2a8h839he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h24afh2327h2336h2438h2461h2487h24d7h2516h2545h255eh25cch1155h)
Received: from mail119-tx2 (localhost.localdomain [127.0.0.1]) by mail119-tx2
(MessageSwitch) id 1393559671808046_32120;
Fri, 28 Feb 2014 03:54:31 +0000 (UTC)
Received: from TX2EHSMHS021.bigfish.com (unknown [10.9.14.231]) by
mail119-tx2.bigfish.com (Postfix) with ESMTP id B5AE480249;
Fri, 28 Feb 2014 03:54:31 +0000 (UTC)
Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS021.bigfish.com
(10.9.99.121) with Microsoft SMTP Server (TLS) id 14.16.227.3;
Fri, 28 Feb 2014 03:54:29 +0000
Received: from az84smr01.freescale.net (10.64.34.197) by
039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP
Server (TLS) id 14.3.158.2; Fri, 28 Feb 2014 03:54:29 +0000
Received: from rock.am.freescale.net (rock.ap.freescale.net [10.193.20.106])
by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id
s1S3sNqp028537; Thu, 27 Feb 2014 20:54:24 -0700
From: Xiubo Li
To: ,
Date: Fri, 28 Feb 2014 10:48:19 +0800
Message-ID: <1393555699-12752-1-git-send-email-Li.Xiubo@freescale.com>
X-Mailer: git-send-email 1.8.0
MIME-Version: 1.0
X-OriginatorOrg: freescale.com
X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn%
X-FOPE-CONNECTOR:
Id%0$Dn%FREESCALE.MAIL.ONMICROSOFT.COM$RO%1$TLS%0$FQDN%$TlsDn%
Cc: tiwai@suse.de, alsa-devel@alsa-project.org,
Xiubo Li , linux-kernel@vger.kernel.org
Subject: [alsa-devel] [PATCH] ASoC: cache: Do the codec->reg_cache zero
pionter check
X-BeenThere: alsa-devel@alsa-project.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Alsa-devel mailing list for ALSA developers -
http://www.alsa-project.org"
List-Unsubscribe:
,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Errors-To: alsa-devel-bounces@alsa-project.org
Sender: alsa-devel-bounces@alsa-project.org
X-Virus-Scanned: ClamAV using ClamSMTP
For the snd_soc_cache_init(), the reg_size maybe zero and then the value
of codec->reg_cache, which is alloced via kzalloc, maybe equal to
ZERO_SIZE_PTR. If the reg parameter of snd_soc_cache_write() is large enough,
the cache[idx] = val maybe cause the kernel crash...
So this patch fix this via doing the zero pionter check of it.
Signed-off-by: Xiubo Li
---
sound/soc/soc-cache.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 375dc6d..bfed3e4 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -96,8 +96,7 @@ int snd_soc_cache_exit(struct snd_soc_codec *codec)
{
dev_dbg(codec->dev, "ASoC: Destroying cache for %s codec\n",
codec->name);
- if (!codec->reg_cache)
- return 0;
+
kfree(codec->reg_cache);
codec->reg_cache = NULL;
return 0;
@@ -117,8 +116,9 @@ int snd_soc_cache_read(struct snd_soc_codec *codec,
return -EINVAL;
mutex_lock(&codec->cache_rw_mutex);
- *value = snd_soc_get_cache_val(codec->reg_cache, reg,
- codec->driver->reg_word_size);
+ if (!ZERO_OR_NULL_PTR(codec->reg_cache))
+ *value = snd_soc_get_cache_val(codec->reg_cache, reg,
+ codec->driver->reg_word_size);
mutex_unlock(&codec->cache_rw_mutex);
return 0;
@@ -136,8 +136,9 @@ int snd_soc_cache_write(struct snd_soc_codec *codec,
unsigned int reg, unsigned int value)
{
mutex_lock(&codec->cache_rw_mutex);
- snd_soc_set_cache_val(codec->reg_cache, reg, value,
- codec->driver->reg_word_size);
+ if (!ZERO_OR_NULL_PTR(codec->reg_cache))
+ snd_soc_set_cache_val(codec->reg_cache, reg, value,
+ codec->driver->reg_word_size);
mutex_unlock(&codec->cache_rw_mutex);
return 0;