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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT 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 E545EC10F11 for ; Wed, 24 Apr 2019 18:11:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B44E920652 for ; Wed, 24 Apr 2019 18:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556129506; bh=doRZBUKHZBBrHbUhJFT70VxwQFX+45Vm08Gtw5C9/h0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0P0E16Ds93fzXVIlcKvR/yU3XemZKyD92YONQ8Yd6HK9dBK1lp18E9/0lmvAFO9Ha nNPFm4vbmq6EKzwykC60Y0c1q95S9m/wpXGMn5aPocVYDRxz7ZdCanx58SsKMrNoLp S3chpN3N9TSu5D50QQDdoZQBADP3ReUJG7s844vI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388204AbfDXSLh (ORCPT ); Wed, 24 Apr 2019 14:11:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:37720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387896AbfDXRNh (ORCPT ); Wed, 24 Apr 2019 13:13:37 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C648B21908; Wed, 24 Apr 2019 17:13:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126017; bh=doRZBUKHZBBrHbUhJFT70VxwQFX+45Vm08Gtw5C9/h0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ypMqF8fWPGDaH25QwHUSaA/NhZQH4ZDJo0aEK0offfHHZRMjyrDZBRRmT2rOjWBmi 7+zRQf3j0ufmMZ4mC8WH1qXluAS0C4nV5Vt6y/S46XrfckBzf+IA3bM6s86T/bTbyk 7y32LasNRGcmPY++qR1s88nFHZwKCmqup1evpbW0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , Takashi Iwai , Sasha Levin Subject: [PATCH 3.18 063/104] ALSA: echoaudio: add a check for ioremap_nocache Date: Wed, 24 Apr 2019 19:09:20 +0200 Message-Id: <20190424170904.380676603@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170839.996641496@linuxfoundation.org> References: <20190424170839.996641496@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 6ade657d6125ec3ec07f95fa51e28138aef6208f ] In case ioremap_nocache fails, the fix releases chip and returns an error code upstream to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/pci/echoaudio/echoaudio.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 3a1fe2c79b4a..c07bf03a07bc 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -1990,6 +1990,11 @@ static int snd_echo_create(struct snd_card *card, } chip->dsp_registers = (volatile u32 __iomem *) ioremap_nocache(chip->dsp_registers_phys, sz); + if (!chip->dsp_registers) { + dev_err(chip->card->dev, "ioremap failed\n"); + snd_echo_free(chip); + return -ENOMEM; + } if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { -- 2.19.1