From: Takashi Iwai Subject: Re: [PATCH RESEND V2] ALSA: hda: fix possible NULL dereference Date: Mon, 24 Aug 2015 15:04:34 +0200 Message-ID: References: <20150823183705.GT31650@mo-online.de> <20150824101740.GA13757@mo-online.de> <20150824121139.GB13757@mo-online.de> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 37F4C260715 for ; Mon, 24 Aug 2015 15:04:35 +0200 (CEST) In-Reply-To: <20150824121139.GB13757@mo-online.de> 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 To: Markus Osterhoff Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org On Mon, 24 Aug 2015 14:11:39 +0200, Markus Osterhoff wrote: > > After a for-loop was replaced by list_for_each_entry, see > Commit bbbc7e8502c9 ("ALSA: hda - Allocate hda_pcm objects dynamically"), > Commit 751e2216899c ("ALSA: hda: fix possible null dereference"), > a possible NULL pointer dereference has been introduced; this patch adds > the NULL check on pcm->pcm, while leaving a potentially superfluous > check on pcm itself untouched. > > Signed-off-by: Markus Osterhoff The patch couldn't be applied cleanly because the tabs are replaced wrongly with spaces, so I applied it manually now. Please fix your MUA or the way to create a patch at the next time. thanks, Takashi > --- > sound/pci/hda/hda_codec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c > index 5de3c5d..d1a2cb6 100644 > --- a/sound/pci/hda/hda_codec.c > +++ b/sound/pci/hda/hda_codec.c > @@ -3172,7 +3172,7 @@ static int add_std_chmaps(struct hda_codec *codec) > struct snd_pcm_chmap *chmap; > const struct snd_pcm_chmap_elem *elem; > > - if (!pcm || pcm->own_chmap || > + if (!pcm || !pcm->pcm || pcm->own_chmap || > !hinfo->substreams) > continue; > elem = hinfo->chmap ? hinfo->chmap : snd_pcm_std_chmaps; >