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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 EB944C433E0 for ; Thu, 18 Jun 2020 02:52:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B90E520776 for ; Thu, 18 Jun 2020 02:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592448731; bh=hoCU8WMiSipGRhTwA1idIQYXuWJKj3HYboe160YztMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=o+4k6EfUnrYZ1krFs+6rkBHXub7pU0a64H4wiuxJJZC4Q+c2uU/iTqVMY4l1dwJBP zZcNy+TCA1MZ8iTLbgOLcV0as2yA208XUCxB4GZc3eJr+Ds2a/g9MJru2l5bljfh9z +ayEKWmeJEFQIZFf7Kg00JVfI9TkvtxohM3bxOLs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728157AbgFRCwG (ORCPT ); Wed, 17 Jun 2020 22:52:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:34620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727881AbgFRBIo (ORCPT ); Wed, 17 Jun 2020 21:08:44 -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 0CA2021D7D; Thu, 18 Jun 2020 01:08:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442523; bh=hoCU8WMiSipGRhTwA1idIQYXuWJKj3HYboe160YztMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ALfbarEtzc0AE6Ct7kHb8hF5w+PRWq/iy+A1kBwLttK1wXjaANFceA81MCMJtrdQS XMZtGKyNrU4uEovT6msSPE8osPbSsAtTRcQabzOr2z8m7FckwBKy1/lyuM+5JpKS0G LSSiQTyVmqddnK/dP8C8NAHJEmb27qswtz4cxCGQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kunihiko Hayashi , Lorenzo Pieralisi , Kishon Vijay Abraham I , Sasha Levin , linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 028/388] PCI: endpoint: functions/pci-epf-test: Fix DMA channel release Date: Wed, 17 Jun 2020 21:02:05 -0400 Message-Id: <20200618010805.600873-28-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kunihiko Hayashi [ Upstream commit 0e86d981f9b7252e9716c5137cd8e4d9ad8ef32f ] When unbinding pci_epf_test, pci_epf_test_clean_dma_chan() is called in pci_epf_test_unbind() even though epf_test->dma_supported is false. As a result, dma_release_channel() will trigger a NULL pointer dereference because dma_chan is not set. Avoid calling dma_release_channel() if epf_test->dma_supported is false. Link: https://lore.kernel.org/r/1587540287-10458-1-git-send-email-hayashi.kunihiko@socionext.com Fixes: 5ebf3fc59bd2 ("PCI: endpoint: functions/pci-epf-test: Add DMA support to transfer data") Signed-off-by: Kunihiko Hayashi [lorenzo.pieralisi@arm.com: commit log] Signed-off-by: Lorenzo Pieralisi Acked-by: Kishon Vijay Abraham I Signed-off-by: Sasha Levin --- drivers/pci/endpoint/functions/pci-epf-test.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c index 60330f3e3751..c89a9561439f 100644 --- a/drivers/pci/endpoint/functions/pci-epf-test.c +++ b/drivers/pci/endpoint/functions/pci-epf-test.c @@ -187,6 +187,9 @@ static int pci_epf_test_init_dma_chan(struct pci_epf_test *epf_test) */ static void pci_epf_test_clean_dma_chan(struct pci_epf_test *epf_test) { + if (!epf_test->dma_supported) + return; + dma_release_channel(epf_test->dma_chan); epf_test->dma_chan = NULL; } -- 2.25.1