lkml.org 
[lkml]   [2019]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 10/93] ALSA: echoaudio: add a check for ioremap_nocache
    Date
    [ 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 <kjlu@umn.edu>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 907cf1a46712..3ef2b27ebbe8 100644
    --- a/sound/pci/echoaudio/echoaudio.c
    +++ b/sound/pci/echoaudio/echoaudio.c
    @@ -1954,6 +1954,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


    \
     
     \ /
      Last update: 2019-04-18 20:17    [W:2.757 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site