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.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=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 B7E53C3276C for ; Thu, 2 Jan 2020 22:44:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8122A217F4 for ; Thu, 2 Jan 2020 22:44:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578005045; bh=XEerCGWjLvl7u8fH0PxDvP1eQh0bK1GSZAxI0UkKFeQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0WK2c9S0bAz7XyNKgRPamkR3kjXsBE8URsWzgP8t4zN7BAWn+jUfJFp/A/9mEtCzJ 6z+1c0nhDnHLTggHbKKg8Jf9/htL4GkxOxF8QjWodWA13LKMY7Xa8O39l3P7WU45N+ GO9K7n+QpMauXgH75iCJ9Ev2cUyE03Y4MVJdn4Ng= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730783AbgABWfK (ORCPT ); Thu, 2 Jan 2020 17:35:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:44554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730762AbgABWfH (ORCPT ); Thu, 2 Jan 2020 17:35:07 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 43F0C20866; Thu, 2 Jan 2020 22:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004506; bh=XEerCGWjLvl7u8fH0PxDvP1eQh0bK1GSZAxI0UkKFeQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vWqbbKYH7lBTb6NgXogFdF1tehjaSSvjKgkxml5KYnAAD8H9sbkwCN8KQ8xBq0jkf vk9WUpJRnHOP0csLjSd50v5kygPJ2YecyCEvEi/+gll9U3C3m7kAwFqYTtTx7f4Lsb JdFaOWcjqtKPyBRrwW859TyaI88qYlzdica24w4E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pan Bian , Mark Brown , Sasha Levin Subject: [PATCH 4.4 036/137] spi: img-spfi: fix potential double release Date: Thu, 2 Jan 2020 23:06:49 +0100 Message-Id: <20200102220551.533515340@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.618583146@linuxfoundation.org> References: <20200102220546.618583146@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 From: Pan Bian [ Upstream commit e9a8ba9769a0e354341bc6cc01b98aadcea1dfe9 ] The channels spfi->tx_ch and spfi->rx_ch are not set to NULL after they are released. As a result, they will be released again, either on the error handling branch in the same function or in the corresponding remove function, i.e. img_spfi_remove(). This patch fixes the bug by setting the two members to NULL. Signed-off-by: Pan Bian Link: https://lore.kernel.org/r/1573007769-20131-1-git-send-email-bianpan2016@163.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-img-spfi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c index 823cbc92d1e7..c46c0738c734 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c @@ -673,6 +673,8 @@ static int img_spfi_probe(struct platform_device *pdev) dma_release_channel(spfi->tx_ch); if (spfi->rx_ch) dma_release_channel(spfi->rx_ch); + spfi->tx_ch = NULL; + spfi->rx_ch = NULL; dev_warn(spfi->dev, "Failed to get DMA channels, falling back to PIO mode\n"); } else { master->dma_tx = spfi->tx_ch; -- 2.20.1