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,URIBL_BLOCKED,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 3766EC282E1 for ; Wed, 24 Apr 2019 17:22:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0253121907 for ; Wed, 24 Apr 2019 17:22:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126553; bh=QOPhOtsI890217ZLprqm3dHIJaVXc4IHks0T7uj9qLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eexn5VCkHtoV1Ev9vYHDSZCBTwl3xSo9WuTRWNYWjKZcBx3HuBGh/vbl956BeTF5W 0Mcz+UsgntvfE3v6W9aaSRB/fyx33KXsszXu4mhvLh+4czYC8QveLjaEwEG9/mWzQs jgG45sVplJCIfUry7WdHxIwaMO33sCXCE13OuviI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389586AbfDXRWc (ORCPT ); Wed, 24 Apr 2019 13:22:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:48076 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388929AbfDXRWa (ORCPT ); Wed, 24 Apr 2019 13:22:30 -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 E460F21907; Wed, 24 Apr 2019 17:22:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126549; bh=QOPhOtsI890217ZLprqm3dHIJaVXc4IHks0T7uj9qLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OH/7l+Ix7FawTfmA/XsT1bSqr+wwFsnzuVypr2nuFxTxSIn0jED8TTez3Envs4wn8 x+HDIrkoqG3JoGrVivhBoGmHjA4xQVCYUFv7DnqllOb02dkmOpkAHlQFXXTbwnZ8aE wm+uj4ktJbcuUENW6TeJDmHF0PYERIunGu2aRKLk= 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 4.4 101/168] ALSA: echoaudio: add a check for ioremap_nocache Date: Wed, 24 Apr 2019 19:09:05 +0200 Message-Id: <20190424170929.622083046@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170923.452349382@linuxfoundation.org> References: <20190424170923.452349382@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 286f5e3686a3..d73ee11a32bd 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -1953,6 +1953,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