From patchwork Mon Mar 1 16:11:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 388736 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3660979jap; Mon, 1 Mar 2021 12:14:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzdH3ozkRba7X7WTa9UN+FunyQhlktUgO1SX3IRfR4wsoG1ZlqAnKDf/iPvIlaXBZ/VdJR0 X-Received: by 2002:a17:906:5453:: with SMTP id d19mr17151724ejp.150.1614629641115; Mon, 01 Mar 2021 12:14:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614629641; cv=none; d=google.com; s=arc-20160816; b=ug56pYe1afzZngvAFpi5Om8gjG133bmFCcnJ+GQ/zrWprQyq1UzFnL01pUZQWtO/n8 E73Ro5wCsrAd1Dgl/D7FFtUSVRzNmtEVaTOLS1wRzZSQyTVo6ZnE1j/6ZmWvkZ3r1sJQ eaaSJvDXjBXywWbVipnvk8Nn31RBXHhbYUziujidS9K7kh7W84irVxIRHHotP8DAK/Rv vLM4YmPgh6jyGVREJ1CiKkzzQj4jgaDImNVHs81r2IX33NoqrwaizH/fDYbyR2tS73NC EX27Xvd8QvEq5eE8q8PcNQOcKEgMbXZKaPIn92lZ0eoj4smhcUf3C1sb+WsfBxcqK7rl raBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9EuU/fw7q6zjHe6k9Yn9h+cjhMIhGWU6suZPp5vis1A=; b=Q9J2RLeqC6lOg9bTf07zR5WDK2dXR8iom10pBrhLBuIn+1+eH4BY4PmZuJNgOv4EBE Q8uyNH+vjuyi9qESXjE1sIofNXjCqi24xruh5ufRZIcW7XXzaqg0kyL4L2fmSOeTDt0h E3TNUoRWPkpIMzNFi4wfoYO1z97xt9Ol1M4mtb9xUcCNZa58JbkChpFE7Wv95l+W+D+b rh33GExARmPmOEPs9jNYnA9XV+CJjuGlFl1EeOO5htfoeqCEEKT3k39gowI0TtZ5xnnr YgPjJonfUk0dFSOpcVyDUlUJ0K2FKCYGSZ79IuBnYisSIeyuIM5698HIdYT02DrUTVNd iHDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pTTRPlIW; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e9si12666972edv.149.2021.03.01.12.14.00; Mon, 01 Mar 2021 12:14:01 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pTTRPlIW; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242805AbhCAUM2 (ORCPT + 13 others); Mon, 1 Mar 2021 15:12:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:37632 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242556AbhCAUCz (ORCPT ); Mon, 1 Mar 2021 15:02:55 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id C5B7265202; Mon, 1 Mar 2021 17:57:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614621439; bh=Lo9NVBj9GRscMtLKDPl2drY3eoab/S0YPLPy2iCWFsU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pTTRPlIWhlezv2qxaTJHo45kZrDRiF1/wPGHTTs1PWt9DnnApXPkdVuh4EmC1uATE VT9AlHpTFwjUZehJmX3Xy/7+cNQG1LCGu+0nOK/lXICxgmcRpb8aiZi5k5TncjOJp6 0z6Tw9vuPGE3fqMuNKYKc/JeWpAZl9hx/o0vW1+w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kalle Valo , Manivannan Sadhasivam , Loic Poulain , Sasha Levin Subject: [PATCH 5.11 516/775] mhi: Fix double dma free Date: Mon, 1 Mar 2021 17:11:24 +0100 Message-Id: <20210301161227.024924069@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161201.679371205@linuxfoundation.org> References: <20210301161201.679371205@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Loic Poulain [ Upstream commit db4e8de1935b0202960e9ebb88ab93e8bd1e66b1 ] mhi_deinit_chan_ctxt functionthat takes care of unitializing channel resources, including unmapping coherent MHI areas, can be called from different path in case of controller unregistering/removal: - From a client driver remove callback, via mhi_unprepare_channel - From mhi_driver_remove that unitialize all channels mhi_driver_remove() |-> driver->remove() | |-> mhi_unprepare_channel() | |-> mhi_deinit_chan_ctxt() |... |-> mhi_deinit_chan_ctxt() This leads to double dma freeing... Fix that by preventing deinit for already uninitialized channel. Link: https://lore.kernel.org/r/1612894264-15956-1-git-send-email-loic.poulain@linaro.org Fixes: a7f422f2f89e ("bus: mhi: Fix channel close issue on driver remove") Reported-by: Kalle Valo Tested-by: Kalle Valo Reviewed-by: Manivannan Sadhasivam Signed-off-by: Loic Poulain Signed-off-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/20210210082538.2494-2-manivannan.sadhasivam@linaro.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/bus/mhi/core/init.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.27.0 diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c index f0697f433c2f1..08c45457c90fe 100644 --- a/drivers/bus/mhi/core/init.c +++ b/drivers/bus/mhi/core/init.c @@ -552,6 +552,9 @@ void mhi_deinit_chan_ctxt(struct mhi_controller *mhi_cntrl, tre_ring = &mhi_chan->tre_ring; chan_ctxt = &mhi_cntrl->mhi_ctxt->chan_ctxt[mhi_chan->chan]; + if (!chan_ctxt->rbase) /* Already uninitialized */ + return; + mhi_free_coherent(mhi_cntrl, tre_ring->alloc_size, tre_ring->pre_aligned, tre_ring->dma_handle); vfree(buf_ring->base);