From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 429102EAB84; Tue, 15 Jul 2025 13:34:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752586481; cv=none; b=UcdGnlGAonWiIUjpEnHmHlDda+MiYlCVtCui5wRll0WtC7Apqq3YEpNzpySLh8FG0bkQHqBly2LIyOtzG6WQfWdCgW4zwPIhNmECPV0zABtn/aVx0MlCQBvuPNkXAwuZXe4ue0daoaFJnxYf/EpHL2J13wgNGsOI0PKR76stCNg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752586481; c=relaxed/simple; bh=aHllR8XRlGMfwDE+8STM3zk3V5Q2jBIYVDoodFBBWEs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m3bVQ3FNMwZRsDmHolhouCxrN/Q0OuhehHKa7yTub3be8A+BbpABh9QM5qAJs+h48DnCV1vzTxspzypCMfs2yioLrBTcsN1FwfL6tgPhi+7xD3qF24shhE+/o6aGdiBmJTkJ5RkXIdz02kgZeCSCTAn1usLq98OXTHBV3al8P5A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GhHMn1H+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GhHMn1H+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA600C4CEE3; Tue, 15 Jul 2025 13:34:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1752586481; bh=aHllR8XRlGMfwDE+8STM3zk3V5Q2jBIYVDoodFBBWEs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GhHMn1H+p7S43Yt4g+/Pw2UF4IFLh+boQPH0jYl/Us6z3mkfuHC9BXjexLVnmOBHh eiYjN4fySHcXsmXp4Sy3zLBcPDcyaFmcoD1QZFlFXqmSjrNGEq+7zmojGpqBaMy/0B Xr9zWeG9F1xIDr5DUlpbBhuSv06s9/fkpzyWlIM8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Masami Hiramatsu (Google)" , Ulf Hansson , Sasha Levin Subject: [PATCH 5.4 082/148] mtk-sd: Prevent memory corruption from DMA map failure Date: Tue, 15 Jul 2025 15:13:24 +0200 Message-ID: <20250715130803.604117768@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250715130800.293690950@linuxfoundation.org> References: <20250715130800.293690950@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masami Hiramatsu (Google) [ Upstream commit f5de469990f19569627ea0dd56536ff5a13beaa3 ] If msdc_prepare_data() fails to map the DMA region, the request is not prepared for data receiving, but msdc_start_data() proceeds the DMA with previous setting. Since this will lead a memory corruption, we have to stop the request operation soon after the msdc_prepare_data() fails to prepare it. Signed-off-by: Masami Hiramatsu (Google) Fixes: 208489032bdd ("mmc: mediatek: Add Mediatek MMC driver") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/174972756982.3337526.6755001617701603082.stgit@mhiramat.tok.corp.google.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/mtk-sd.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 5d330f2a3faae..dbe3478cc2308 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -686,6 +686,11 @@ static void msdc_prepare_data(struct msdc_host *host, struct mmc_data *data) } } +static bool msdc_data_prepared(struct mmc_data *data) +{ + return data->host_cookie & MSDC_PREPARE_FLAG; +} + static void msdc_unprepare_data(struct msdc_host *host, struct mmc_data *data) { if (data->host_cookie & MSDC_ASYNC_FLAG) @@ -1198,8 +1203,18 @@ static void msdc_ops_request(struct mmc_host *mmc, struct mmc_request *mrq) WARN_ON(host->mrq); host->mrq = mrq; - if (mrq->data) + if (mrq->data) { msdc_prepare_data(host, mrq->data); + if (!msdc_data_prepared(mrq->data)) { + /* + * Failed to prepare DMA area, fail fast before + * starting any commands. + */ + mrq->cmd->error = -ENOSPC; + mmc_request_done(mmc_from_priv(host), mrq); + return; + } + } /* if SBC is required, we have HW option and SW option. * if HW option is enabled, and SBC does not have "special" flags, -- 2.39.5