Message ID | 20190315035830.29557-1-kjlu@umn.edu (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <alsa-devel-bounces@alsa-project.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DBCC36C2 for <patchwork-alsa-devel@patchwork.kernel.org>; Sat, 16 Mar 2019 09:36:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B85CD2AA88 for <patchwork-alsa-devel@patchwork.kernel.org>; Sat, 16 Mar 2019 09:36:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A957028FBC; Sat, 16 Mar 2019 09:36:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 02A0328FBC for <patchwork-alsa-devel@patchwork.kernel.org>; Sat, 16 Mar 2019 09:36:49 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 3D55E892; Sat, 16 Mar 2019 10:35:57 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3D55E892 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1552729007; bh=NXEs6pcOHGyKnXf8TD8S3LNM4CoxHvyZYNeDKJghCqo=; h=From:To:Date:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=l968BUuf6O4s8GrAD0/ZddJmSeIqqKUiEl1kePFQQ8jcJ/zvFONFOCMUpAa76ZCT0 MG8LUj/Mm2jRO2tpwnbd2RFMO+WT9DTXasC9dU7GNhZvJJobLZWe4ih/SWwZdISX6G Jxxf2Rek2UkGW39i33MDKln616NINknTZXp3mRfM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 2E6FFF8971F; Sat, 16 Mar 2019 10:33:54 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id A865DF89701; Fri, 15 Mar 2019 04:58:58 +0100 (CET) Received: from mta-p6.oit.umn.edu (mta-p6.oit.umn.edu [134.84.196.206]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 02499F8961E for <alsa-devel@alsa-project.org>; Fri, 15 Mar 2019 04:58:50 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 02499F8961E Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="E6SvlpoE" Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 71190D44 for <alsa-devel@alsa-project.org>; Fri, 15 Mar 2019 03:58:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PwE4l8HfecZ3 for <alsa-devel@alsa-project.org>; Thu, 14 Mar 2019 22:58:48 -0500 (CDT) Received: from mail-it1-f199.google.com (mail-it1-f199.google.com [209.85.166.199]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 4D510D43 for <alsa-devel@alsa-project.org>; Thu, 14 Mar 2019 22:58:47 -0500 (CDT) Received: by mail-it1-f199.google.com with SMTP id w200so6605197itc.8 for <alsa-devel@alsa-project.org>; Thu, 14 Mar 2019 20:58:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=iLUkp8oVLq+kPOC38MJgOVEnJVsUq0i1VhMkxALVLd0=; b=E6SvlpoEwPWeiJXvJnhaDGPXNWHFg5Ns2SIKUPqI6Fiy01XUyf0+cYYnyrZLMpScOm +jKQPH08Qi53FthfV3vceJ7LekOzZ1X8J63f+PwlRXVSeKYXGDXpHx7j5LTF3lP0ahcU RFjyuhlKRxZZj4yRFi8qWNjDK9EwNgPqPENRfJxtk8pBUN4sTIIbB6hfGFFxJCX2d6C7 OQjmwkMvbl0z8x0FTEUq9NIDKwvO66X/c2zB1lZ2fOR1i06ysUnoSohKqDqS/G5/U3Rw 119KWA8FJmAlJuAnk6iz7w22CmwqJQvm5X+Bw3VODMZhFCEX60GgCypk++HioMNoqAvN ne2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=iLUkp8oVLq+kPOC38MJgOVEnJVsUq0i1VhMkxALVLd0=; b=NOEuJLzjky2issCOzgirq37P5bhqLjVz26MF3ZmiZZGwY6JP12PWcpPGSwnnFUgzH4 19mOY04e1dUQYOEGj8qbqlAKbvGlRriWW9N2f23wm/v4yYHZL7xMlYIkvkny6Is30zCZ HzTM+llXHNCLt2PlR9FC4HZ2s671wrmn9Cb6NO2uxod214mY4FnWHr6W5wD8xR5U7uCF ipWmuHG2SS40iqqdOfDmK67ZgzbA8wcZ9pUYzZLAzlqMgpOd95hHoiLEIdd9sMd4Fhp7 UXOWaD9Eq2Lu2hBPC47kQTExAh2TjCJyitFc2RUvCMln4xldy6gmSu/CeBv3hGxYcqmj 3H1g== X-Gm-Message-State: APjAAAXPbi0OlyhxBy490vQI49oyjCSsixZtmhwFGeCxj+79plKPJwd2 TDbXxXfA5FCTpCKOfcjEAqkUa658vDItFBpuwVOg2s9gMEg9zyiN+OqNmPIBH8gHVh7jz4TDRdA yEOIElORtspBjBvcZI/TCskZhya4= X-Received: by 2002:a5e:c604:: with SMTP id f4mr865490iok.263.1552622326623; Thu, 14 Mar 2019 20:58:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqwgUYeDx9rAeox18Vo0FsSk0JDVjFOsteVA7vc7GpjHVd+B8wqpiSbzaPVaqMHEGIuTx1mJ/Q== X-Received: by 2002:a5e:c604:: with SMTP id f4mr865481iok.263.1552622326390; Thu, 14 Mar 2019 20:58:46 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id x191sm552885itb.8.2019.03.14.20.58.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 20:58:45 -0700 (PDT) From: Kangjie Lu <kjlu@umn.edu> To: kjlu@umn.edu Date: Thu, 14 Mar 2019 22:58:29 -0500 Message-Id: <20190315035830.29557-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 X-Mailman-Approved-At: Sat, 16 Mar 2019 10:33:48 +0100 Cc: alsa-devel@alsa-project.org, "Gustavo A. R. Silva" <gustavo@embeddedor.com>, Takashi Iwai <tiwai@suse.com>, linux-kernel@vger.kernel.org, pakki001@umn.edu Subject: [alsa-devel] [PATCH] sound: echoaudio: add a check for ioremap_nocache X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" <alsa-devel.alsa-project.org> List-Unsubscribe: <https://mailman.alsa-project.org/mailman/options/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/> List-Post: <mailto:alsa-devel@alsa-project.org> List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> List-Subscribe: <https://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" <alsa-devel-bounces@alsa-project.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
sound: echoaudio: add a check for ioremap_nocache
|
expand
|
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index ea876b0b02b9..dc0084dc8550 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -1952,6 +1952,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)) {
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 <kjlu@umn.edu> --- sound/pci/echoaudio/echoaudio.c | 5 +++++ 1 file changed, 5 insertions(+)