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.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,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 5434DC04AA6 for ; Mon, 29 Apr 2019 18:25:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2372521655 for ; Mon, 29 Apr 2019 18:25:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="J4S+dRaE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729009AbfD2SZy (ORCPT ); Mon, 29 Apr 2019 14:25:54 -0400 Received: from mail-it1-f193.google.com ([209.85.166.193]:32962 "EHLO mail-it1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728940AbfD2SZx (ORCPT ); Mon, 29 Apr 2019 14:25:53 -0400 Received: by mail-it1-f193.google.com with SMTP id v8so634146itf.0 for ; Mon, 29 Apr 2019 11:25:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YaQCnzzh+3p/v5Fojy+snkCdhoa+2CZox1xOwkyLqvU=; b=J4S+dRaERgYYJqnVpVLtPqQznX5dFlnBdW1GSin1hyFvVPaVFzBMJJghFLtjWDxjRT v4iQjjYiEm5qqJHFhcTf+I2XtMweu48chGehJmqyEzO/Qd5UGSJCqE5O7ITg1jCUrp1O sLkB+tB1sLss3OVRYXkzt7MWCq2RCJl+FymYM= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=YaQCnzzh+3p/v5Fojy+snkCdhoa+2CZox1xOwkyLqvU=; b=UBaTb6Uq4Jgq7MOIpa4yZcesviGgFhexEFy4Ff20IyBHngsi+BOFe0LyhrRsvYNDe7 H3hRvbrWxNtoY/4OSiO/q4S+RNnMXajoG3i1m5+Wv7HnMJLHQa0htLZC6uOYjuB8mElX aIwBJkW4Is9Ox/p7hEwGgfV3kGf+PRAwgo6oTPLm9gg+nEBJl56kiaskfj8nOS6s+qY3 UpOMLMqQuBA7RU7LZanXxrqU1aJFW5M84O46GUVFweU8NhSTeVWFxmYc1UpqLdcEUL1Z w3wLaTVbQv+3QnDoLBNAYDbuqbEDGMbtp1X9su935iDRSd4yT5pGQDyUC1WeyRKL3UVj phzw== X-Gm-Message-State: APjAAAVxCDS40Vv69Jq8VwEAcOsh7ViTvRX5MyxFc+Y/J+77AvwER54z VbbGevUvonb5k2akibOv3RZuAQ== X-Google-Smtp-Source: APXvYqwBCurYe1oxJjzdJiVGjz+EDb8ToH9Z6RTcJkNpjitcglw/xKq/Iljl45Uzy6HrBv+Pj9q+6w== X-Received: by 2002:a05:660c:24e:: with SMTP id t14mr371088itk.50.1556562352791; Mon, 29 Apr 2019 11:25:52 -0700 (PDT) Received: from localhost ([2620:15c:183:200:855f:8919:84a7:4794]) by smtp.gmail.com with ESMTPSA id y199sm12894585iof.88.2019.04.29.11.25.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 11:25:51 -0700 (PDT) From: Ross Zwisler X-Google-Original-From: Ross Zwisler To: Pierre-Louis Bossart , linux-kernel@vger.kernel.org Cc: Ross Zwisler , Jaroslav Kysela , Jie Yang , Liam Girdwood , Mark Brown , Takashi Iwai , alsa-devel@alsa-project.org, stable@vger.kernel.org Subject: [PATCH v2] ASoC: Intel: avoid Oops if DMA setup fails Date: Mon, 29 Apr 2019 12:25:17 -0600 Message-Id: <20190429182517.210909-1-zwisler@google.com> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog In-Reply-To: <0b030b85-00c8-2e35-3064-bb764aaff0f6@linux.intel.com> References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently in sst_dsp_new() if we get an error return from sst_dma_new() we just print an error message and then still complete the function successfully. This means that we are trying to run without sst->dma properly set up, which will result in NULL pointer dereference when sst->dma is later used. This was happening for me in sst_dsp_dma_get_channel(): struct sst_dma *dma = dsp->dma; ... dma->ch = dma_request_channel(mask, dma_chan_filter, dsp); This resulted in: BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 IP: sst_dsp_dma_get_channel+0x4f/0x125 [snd_soc_sst_firmware] Fix this by adding proper error handling for the case where we fail to set up DMA. This change only affects Haswell and Broadwell systems. Baytrail systems explicilty opt-out of DMA via sst->pdata->resindex_dma_base being set to -1. Signed-off-by: Ross Zwisler Cc: stable@vger.kernel.org --- Changes in v2: - Upgraded the sst_dma_new() failure message from dev_warn() to dev_err() (Pierre-Louis). - Noted in the changelog that this change only affects Haswell and Broadwell (Pierre-Louis). --- sound/soc/intel/common/sst-firmware.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c index 1e067504b6043..f830e59f93eaa 100644 --- a/sound/soc/intel/common/sst-firmware.c +++ b/sound/soc/intel/common/sst-firmware.c @@ -1251,11 +1251,15 @@ struct sst_dsp *sst_dsp_new(struct device *dev, goto irq_err; err = sst_dma_new(sst); - if (err) - dev_warn(dev, "sst_dma_new failed %d\n", err); + if (err) { + dev_err(dev, "sst_dma_new failed %d\n", err); + goto dma_err; + } return sst; +dma_err: + free_irq(sst->irq, sst); irq_err: if (sst->ops->free) sst->ops->free(sst); -- 2.21.0.593.g511ec345e18-goog