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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 A11F0C43381 for ; Sat, 30 Mar 2019 01:00:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 60676206DD for ; Sat, 30 Mar 2019 01:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907604; bh=2rWYJvhuNuUnH+vJBk8D51hT1wy7nXgnOojCXjyMeGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nM6IN/JFPLO8DKS+LkIplbF5qD8qwPocWGUYNzKsv+0WgF30mLTpSr9rOJzDzyghs 8quFe6LSqpsNdLyF4wSdyg0TEw3uFEZCy4GG37ViKY+wWhEcNkUxkwVqcgmvU/v5V2 KU1IRcqHowWlWeCLVD3Ohg7J2KEIS3yYIOHmIMYQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730832AbfC3A45 (ORCPT ); Fri, 29 Mar 2019 20:56:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:36828 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731419AbfC3A44 (ORCPT ); Fri, 29 Mar 2019 20:56:56 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8A9072064A; Sat, 30 Mar 2019 00:56:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907416; bh=2rWYJvhuNuUnH+vJBk8D51hT1wy7nXgnOojCXjyMeGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iO5R5f2cWSRwoLJl4bGCJ9pUUmKW6m/xYcuNdX8WL+2P+cZq0zDp83Sedac9XKi8k 0dJDH09jZxuz6XmElutCWAfZPMVXSzhtQMueyt7bXbDJXY9MY71owtkErqg14u5pcv sQG81PhhhQDzY+XK/kZGvpElMFm52Vrcy6e5uHJU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kangjie Lu , Takashi Iwai , Sasha Levin Subject: [PATCH AUTOSEL 4.4 04/21] ALSA: echoaudio: add a check for ioremap_nocache Date: Fri, 29 Mar 2019 20:56:32 -0400 Message-Id: <20190330005649.28475-4-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005649.28475-1-sashal@kernel.org> References: <20190330005649.28475-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kangjie Lu [ 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