From patchwork Mon May 10 10:16:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 433089 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2756287jao; Mon, 10 May 2021 04:43:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+mPbC5GVO5FkfWdENX5hjsA6EFwDJrXrwXcxAGQeDHauxVoadUM3dJ3Hx1p7m5Pj+42v+ X-Received: by 2002:a05:6402:284:: with SMTP id l4mr29306252edv.299.1620646995504; Mon, 10 May 2021 04:43:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620646995; cv=none; d=google.com; s=arc-20160816; b=NvWKuAL9hwzs5G/Kpku1gmGvLP7cIBSnrNtVZtt7ygY+1QcChOPdE/F32SJSzCDhYS cBj//IAlOsnUfB9U68ok9PQp1FD98eGvzXiPAbxkZ/3CcUH4QMuak7zcC4/R7IqZP36h sByr04yTJKDSto21FJ69ZVN+ieFHmxrf1/2OM/Ny3y5J0iHMy9aTzpqi+yAiWaZSejGD 5ZLrPEh1gX6T0m/muLrLQ0WwRkntk3O+IJpenQIDgFYKeRETkZoHK36thzK0kItwdc6q qmxj+rdEyJR7o6b2Q6IspiUlbIvODbRQk3dG5EJicpw1YtUcG3q+vIVL2dEopptaGpcj 2Pfw== 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=Gfo/NmBde4IsTVHRyuaVMw6eAy62d03hSQ+USJ6yHDU=; b=gdNZM9ctwGALXOcoPpGFC8puv1kRd9gC5Th+wL3Cg7blS2cGjPvuifMG/raksB9EWG 0HW5z7QzNmWq0eZWK/1JKo8jA/jydCh+1Swubxk7Ky2sjXIc5TetFjFD3fJhtoZ9v44s H1q0QUACFedAd1nFuhRznT/Nu4A0xzK646O9esZgjcBPdI5WDeEydBX8OunzUSnFQvP2 HyjKOfURpUlIBrmXU0Kg5rajPRSwJ+R8x/1zfyD/bjEGbet5QDyVBFC5aVqtGyRi1avx HyUCViW3JHlwFH+QDCp9SKqzySnBoxN4G6vRpX8f4M9DgZKzedZ6CbO+1lQJvUqTLXzI 0pWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UnWk2rmi; 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 r17si13500365edw.273.2021.05.10.04.43.11; Mon, 10 May 2021 04:43:15 -0700 (PDT) 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=UnWk2rmi; 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 S237340AbhEJLOm (ORCPT + 12 others); Mon, 10 May 2021 07:14:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:41148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236161AbhEJLHk (ORCPT ); Mon, 10 May 2021 07:07:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A89B861939; Mon, 10 May 2021 10:58:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644330; bh=FLTjyOyqJvwchvnf8FfR7GtTTxii4g1YA1EfzgPKwug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UnWk2rmiVjSXdJxhvn6YW/0P4X0KSSTQnRZ//lM8E90fzKpSDX/KEvWcdfE5VdWlb gLovVPavu39iaFPE8Fz6QZBMX23qbZi/B84DqvxOYmp0Z0ldwVTaizgkgC/Gq0l1Jw POlyU+davBoQZ52Etuj7yCdEvWb17DyoEzriKUB8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Loic Poulain , Jeffrey Hugo , Bhaumik Bhatt , Manivannan Sadhasivam Subject: [PATCH 5.12 007/384] bus: mhi: core: Fix invalid error returning in mhi_queue Date: Mon, 10 May 2021 12:16:36 +0200 Message-Id: <20210510102015.115375535@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@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 commit 0ecc1c70dcd32c0f081b173a1a5d89952686f271 upstream. mhi_queue returns an error when the doorbell is not accessible in the current state. This can happen when the device is in non M0 state, like M3, and needs to be waken-up prior ringing the DB. This case is managed earlier by triggering an asynchronous M3 exit via controller resume/suspend callbacks, that in turn will cause M0 transition and DB update. So, since it's not an error but just delaying of doorbell update, there is no reason to return an error. This also fixes a use after free error for skb case, indeed a caller queuing skb will try to free the skb if the queueing fails, but in that case queueing has been done. Fixes: a8f75cb348fd ("mhi: core: Factorize mhi queuing") Signed-off-by: Loic Poulain Reviewed-by: Jeffrey Hugo Reviewed-by: Bhaumik Bhatt Reviewed-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/1614336782-5809-1-git-send-email-loic.poulain@linaro.org Signed-off-by: Manivannan Sadhasivam Signed-off-by: Greg Kroah-Hartman --- drivers/bus/mhi/core/main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) --- a/drivers/bus/mhi/core/main.c +++ b/drivers/bus/mhi/core/main.c @@ -1077,12 +1077,8 @@ static int mhi_queue(struct mhi_device * if (mhi_chan->dir == DMA_TO_DEVICE) atomic_inc(&mhi_cntrl->pending_pkts); - if (unlikely(!MHI_DB_ACCESS_VALID(mhi_cntrl))) { - ret = -EIO; - goto exit_unlock; - } - - mhi_ring_chan_db(mhi_cntrl, mhi_chan); + if (likely(MHI_DB_ACCESS_VALID(mhi_cntrl))) + mhi_ring_chan_db(mhi_cntrl, mhi_chan); if (dir == DMA_FROM_DEVICE) mhi_cntrl->runtime_put(mhi_cntrl);