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=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 E5142C48BE8 for ; Mon, 24 Jun 2019 10:18:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3BB420645 for ; Mon, 24 Jun 2019 10:18:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371518; bh=KDRwmMMXjnhIupyqcWSvt37oEaC6vmIw/bQxsrFBOvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RiuvOvFivgV4anpeKNKoDFfXdHqPqsQJJ1k9QRr/NKPm+MzQm0+HbB1M/486eWjMG WY+QNKV910G6f/zsz6kWbca/jpqt1FdgCen1K/FsMHmxKclZy/DrVCU0EEaa+D6A9Z i2otidC3aMl+emxYhujJaT2Me98Bt34YQM2VjY2w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729923AbfFXKQB (ORCPT ); Mon, 24 Jun 2019 06:16:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:53340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730401AbfFXKP4 (ORCPT ); Mon, 24 Jun 2019 06:15:56 -0400 Received: from localhost (f4.8f.5177.ip4.static.sl-reverse.com [119.81.143.244]) (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 C1F5F205ED; Mon, 24 Jun 2019 10:15:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371355; bh=KDRwmMMXjnhIupyqcWSvt37oEaC6vmIw/bQxsrFBOvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=07hsR1K9WQcs83sQ+I37VIIzYhTuE5E4msJ4kudybZcQEdvodCysu/kXFRzfbzopn vT4/4HUosrMfSRWxbtFeI5V2qy28GI29i8SAUTwr65n4TFcmFIA/sg+q0Fjh7JOJ4c IizQ9pETGkLz0NqCO3Mx3/V4cZme4hUiQ9wHdak0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Baolin Wang , Vinod Koul , Sasha Levin Subject: [PATCH 5.1 037/121] dmaengine: sprd: Add validation of current descriptor in irq handler Date: Mon, 24 Jun 2019 17:56:09 +0800 Message-Id: <20190624092322.707315593@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624092320.652599624@linuxfoundation.org> References: <20190624092320.652599624@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 58152b0e573e5581c4b9ef7cf06d2e9fafae27d4 ] When user terminates one DMA channel to free all its descriptors, but at the same time one transaction interrupt was triggered possibly, now we should not handle this interrupt by validating if the 'schan->cur_desc' was set as NULL to avoid crashing the kernel. Signed-off-by: Baolin Wang Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/sprd-dma.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c index e29342ab85f6..431e289d59a5 100644 --- a/drivers/dma/sprd-dma.c +++ b/drivers/dma/sprd-dma.c @@ -552,12 +552,17 @@ static irqreturn_t dma_irq_handle(int irq, void *dev_id) schan = &sdev->channels[i]; spin_lock(&schan->vc.lock); + + sdesc = schan->cur_desc; + if (!sdesc) { + spin_unlock(&schan->vc.lock); + return IRQ_HANDLED; + } + int_type = sprd_dma_get_int_type(schan); req_type = sprd_dma_get_req_type(schan); sprd_dma_clear_int(schan); - sdesc = schan->cur_desc; - /* cyclic mode schedule callback */ cyclic = schan->linklist.phy_addr ? true : false; if (cyclic == true) { -- 2.20.1