[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <CD6925E8781EFD4D8E11882D20FC406D529FE3B6@SHSMSX104.ccr.corp.intel.com>
Date: Mon, 5 Nov 2018 08:29:14 +0000
From: "He, Bo" <bo.he@...el.com>
To: "alsa-devel@...a-project.org" <alsa-devel@...a-project.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
CC: "pierre-louis.bossart@...ux.intel.com"
<pierre-louis.bossart@...ux.intel.com>,
"liam.r.girdwood@...ux.intel.com" <liam.r.girdwood@...ux.intel.com>,
"perex@...ex.cz" <perex@...ex.cz>,
"tiwai@...e.com" <tiwai@...e.com>,
"Singh, Guneshwor O" <guneshwor.o.singh@...el.com>,
"Periyasamy, SriramX" <sriramx.periyasamy@...el.com>,
"Kale, Sanyog R" <sanyog.r.kale@...el.com>,
"Kesapragada, Pardha Saradhi" <pardha.saradhi.kesapragada@...el.com>,
"kuninori.morimoto.gx@...esas.com" <kuninori.morimoto.gx@...esas.com>,
"guruprasadx.pawse@...el.com" <guruprasadx.pawse@...el.com>,
"Ughreja, Rakesh A" <rakesh.a.ughreja@...el.com>,
"Prakash, Divya1" <divya1.prakash@...el.com>,
"Diwakar, Praveen" <praveen.diwakar@...el.com>,
"Zhang, Yanmin" <yanmin.zhang@...el.com>
Subject: [PATCH] fix the kernel panic due to wrong use the dev memory API
skl->dais is allocated with devm_kcalloc, can't free with
the krealloc. Memory allocated with devm API is automatically freed
on driver detach, Like all other devres resources.
Refer to drivers/base/devres.c devm_kmalloc for more details.
Signed-off-by: he, bo <bo.he@...el.com>
---
sound/soc/intel/skylake/skl-pcm.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index 823e391..928d314 100644
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -1438,7 +1438,8 @@ int skl_platform_register(struct device *dev)
}
if (!skl->use_tplg_pcm) {
- dais = krealloc(skl->dais, sizeof(skl_fe_dai) +
+ devm_kfree(dev, skl->dais);
+ dais = devm_kcalloc(dev, skl->dais, sizeof(skl_fe_dai) +
sizeof(skl_platform_dai), GFP_KERNEL);
if (!dais) {
ret = -ENOMEM;
@@ -1472,7 +1473,5 @@ int skl_platform_unregister(struct device *dev)
}
}
- kfree(skl->dais);
-
return 0;
}
--
2.7.4
Powered by blists - more mailing lists