From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933082AbdHVOpX (ORCPT ); Tue, 22 Aug 2017 10:45:23 -0400 Received: from regular1.263xmail.com ([211.150.99.133]:53512 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932647AbdHVOpW (ORCPT ); Tue, 22 Aug 2017 10:45:22 -0400 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: <7ef48c3d89bbdbfc4b7f71727616ed21> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: Jeffy Chen To: linux-kernel@vger.kernel.org, broonie@kernel.org Cc: tiwai@suse.de, dolinux.peng@gmail.com, Jeffy Chen , Jaroslav Kysela , alsa-devel@alsa-project.org, Takashi Iwai , Liam Girdwood Subject: [PATCH] ASoC: Add a sanity check before using dai driver name Date: Tue, 22 Aug 2017 22:45:12 +0800 Message-Id: <20170822144512.12976-1-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The dai driver's name is allowed to be NULL. So add a sanity check for that. Signed-off-by: Jeffy Chen Reported-by: Donglin Peng --- sound/soc/soc-core.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 77e7e2a11af0..8ab9ee2b460a 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -978,11 +978,13 @@ struct snd_soc_dai *snd_soc_find_dai( if (dlc->name && strcmp(component->name, dlc->name)) continue; list_for_each_entry(dai, &component->dai_list, list) { - if (dlc->dai_name && strcmp(dai->name, dlc->dai_name) - && strcmp(dai->driver->name, dlc->dai_name)) - continue; - - return dai; + if (!dlc->dai_name) + return dai; + if (!strcmp(dai->name, dlc->dai_name)) + return dai; + if (dai->driver->name && + !strcmp(dai->driver->name, dlc->dai_name)) + return dai; } } -- 2.11.0