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,URIBL_BLOCKED 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 820F2C43387 for ; Tue, 1 Jan 2019 08:34:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49B692075D for ; Tue, 1 Jan 2019 08:34:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728525AbfAAIeR (ORCPT ); Tue, 1 Jan 2019 03:34:17 -0500 Received: from mx2.suse.de ([195.135.220.15]:35838 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728391AbfAAIeQ (ORCPT ); Tue, 1 Jan 2019 03:34:16 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 4519DAE10; Tue, 1 Jan 2019 08:34:15 +0000 (UTC) Date: Tue, 01 Jan 2019 09:34:14 +0100 Message-ID: From: Takashi Iwai To: "Pierre-Louis Bossart" Cc: "Kangjie Lu" , , "Mark Brown" , "Liam Girdwood" , "Jie Yang" , "Jaroslav Kysela" , "Kuninori Morimoto" , , Subject: Re: [PATCH] sound: atom: fix a missing check of snd_pcm_lib_malloc_pages In-Reply-To: References: <20181226022950.71824-1-kjlu@umn.edu> 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/26 (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 Wed, 26 Dec 2018 18:57:47 +0100, Pierre-Louis Bossart wrote: > > > On 12/25/18 8:29 PM, Kangjie Lu wrote: > > snd_pcm_lib_malloc_pages() may fail, so let's check its status and > > return its error code upstream. > > Acked-by: Pierre-Louis Bossart This fixes a potential kernel Oops. Mark, please put Cc to stable when applying. thanks, Takashi > > > > > > Signed-off-by: Kangjie Lu > > --- > > sound/soc/intel/atom/sst-mfld-platform-pcm.c | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c > > index afc559866095..91a2436ce952 100644 > > --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c > > +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c > > @@ -399,7 +399,13 @@ static int sst_media_hw_params(struct snd_pcm_substream *substream, > > struct snd_pcm_hw_params *params, > > struct snd_soc_dai *dai) > > { > > - snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params)); > > + int ret; > > + > > + ret = > > + snd_pcm_lib_malloc_pages(substream, > > + params_buffer_bytes(params)); > > + if (ret) > > + return ret; > > memset(substream->runtime->dma_area, 0, params_buffer_bytes(params)); > > return 0; > > } >