From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12473C43381 for ; Wed, 13 Mar 2019 10:24:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0F0A2173C for ; Wed, 13 Mar 2019 10:24:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726083AbfCMKYf (ORCPT ); Wed, 13 Mar 2019 06:24:35 -0400 Received: from mx2.suse.de ([195.135.220.15]:54808 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725847AbfCMKYf (ORCPT ); Wed, 13 Mar 2019 06:24:35 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 5307FAD33; Wed, 13 Mar 2019 10:24:34 +0000 (UTC) Date: Wed, 13 Mar 2019 11:24:33 +0100 Message-ID: From: Takashi Iwai To: "Mariusz Ceier" Cc: , "Pierre-Louis Bossart" , "Keyon Jie" , "Mohan Kumar D" , "Ravindra Lokhande" , "Sameer Pujar" , "Jaroslav Kysela" , Subject: Re: [PATCH 1/1] sound/hda/hdac_stream: Avoid NULL pointer dereference In-Reply-To: <20190311205357.7573-2-mceier+kernel@gmail.com> References: <20190311205357.7573-1-mceier+kernel@gmail.com> <20190311205357.7573-2-mceier+kernel@gmail.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 11 Mar 2019 21:53:57 +0100, Mariusz Ceier wrote: > > For ca0132 codec, azx_dev->stream is NULL during firmware loading. > Calling snd_hdac_get_stream_stripe_ctl unconditionally causes NULL > pointer dereference in that function. > > Signed-off-by: Mariusz Ceier Applied now (with a proper Fixes tag). thanks, Takashi > --- > sound/hda/hdac_stream.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c > index f5dd288d1a7a..76e9b41fcea2 100644 > --- a/sound/hda/hdac_stream.c > +++ b/sound/hda/hdac_stream.c > @@ -95,7 +95,10 @@ void snd_hdac_stream_start(struct hdac_stream *azx_dev, bool fresh_start) > 1 << azx_dev->index, > 1 << azx_dev->index); > /* set stripe control */ > - stripe_ctl = snd_hdac_get_stream_stripe_ctl(bus, azx_dev->substream); > + if (azx_dev->substream) > + stripe_ctl = snd_hdac_get_stream_stripe_ctl(bus, azx_dev->substream); > + else > + stripe_ctl = 0; > snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK, > stripe_ctl); > /* set DMA start and interrupt mask */ > -- > 2.21.0 > >