From patchwork Wed Aug 14 14:06:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Massimiliano Pellizzer X-Patchwork-Id: 1972441 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WkVSj03vwz1yXl for ; Thu, 15 Aug 2024 00:07:32 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1seEer-0003GB-8a; Wed, 14 Aug 2024 14:07:25 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1seEeo-0003FR-ON for kernel-team@lists.ubuntu.com; Wed, 14 Aug 2024 14:07:22 +0000 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 4C9F83F0F8 for ; Wed, 14 Aug 2024 14:07:22 +0000 (UTC) Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a7a8a38a4bcso207252666b.0 for ; Wed, 14 Aug 2024 07:07:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723644441; x=1724249241; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uRW4c3f95JqukmlyFrjk71TTTaNjJE0ZO3Ck8ef87yM=; b=jfx/jq8b+jwydPlYKkBlRpL2oi8b8eLvMdDWRJ0tQALWxIn0GrZZ833wS4qbiPsCd/ PHSk/MVDy7RfG885hjMn1otp/R9S1CZYsYCn/R77E9HDTtu2KQnU99IJjz+a4zuAvbna JnZhBQkB5qhGcVfOot1XjKQmEo5FJeeZgFZVdOEy3hC9jilazSvXOzZEPAV6vwPwKZ42 1hDpGgmoRa0v1KbTI0fzPz+j9NH9qCRfieVc4czfajg4Eq9EtE3NyZgb5sLyttSmW/rz A2kIBOxZVfOD2dTTZ8SHnSb3zA6jYXVi4AvZiUP1LnLjFtd3f1iXsO729DbMxkoAadSQ EZCQ== X-Gm-Message-State: AOJu0YyLNiKeuTHmHkU4vcBSPjuhWaG4bFOhVHDjZWCTi3zzYzWdichr 5oPdPL9P61QOMlqG9Z/oyzSGSO11X7t2+04MrIZt+AOZQgotz5Gbic6TFnpeMxanuVlJwUgbTIs trW57C6XlCGd4SWQ2PgGzkfMw6Z5uqVT5QP2rZgZnlBaa45XWh4lAU79J7J/+a0eSResdK1shq/ O1gN6bc7CsSQ== X-Received: by 2002:a05:6402:354b:b0:58e:2f7c:a9c with SMTP id 4fb4d7f45d1cf-5bea1cad16dmr2663041a12.26.1723644441423; Wed, 14 Aug 2024 07:07:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGMzQJC+0by64eKm+fphOF2/zya3GrbM6xpZDUcIcz5S8ofAV7jhsoXWse3jIHdGH5apbTqTg== X-Received: by 2002:a05:6402:354b:b0:58e:2f7c:a9c with SMTP id 4fb4d7f45d1cf-5bea1cad16dmr2663009a12.26.1723644440842; Wed, 14 Aug 2024 07:07:20 -0700 (PDT) Received: from framework-canonical.station (net-93-71-65-44.cust.vodafonedsl.it. [93.71.65.44]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5bd190adc42sm3862202a12.21.2024.08.14.07.07.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Aug 2024 07:07:20 -0700 (PDT) From: Massimiliano Pellizzer To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 1/3] mmc: mmci_sdmmc: Rename sdmmc_priv struct to sdmmc_idma Date: Wed, 14 Aug 2024 16:06:46 +0200 Message-ID: <20240814140700.116379-2-massimiliano.pellizzer@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814140700.116379-1-massimiliano.pellizzer@canonical.com> References: <20240814140700.116379-1-massimiliano.pellizzer@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Ludovic Barre This patch renames sdmmc_priv struct to sdmmc_idma which is assigned to host->dma_priv. Signed-off-by: Ludovic Barre Link: https://lore.kernel.org/r/20200128090636.13689-3-ludovic.barre@st.com Signed-off-by: Ulf Hansson (cherry picked from commit bdbf9faf5f2e6bb0c0243350428c908ac85c16b2) CVE-2024-26787 Signed-off-by: Massimiliano Pellizzer --- drivers/mmc/host/mmci_stm32_sdmmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/mmci_stm32_sdmmc.c b/drivers/mmc/host/mmci_stm32_sdmmc.c index 3bb59d670220..aa8c0ab9efd1 100644 --- a/drivers/mmc/host/mmci_stm32_sdmmc.c +++ b/drivers/mmc/host/mmci_stm32_sdmmc.c @@ -20,7 +20,7 @@ struct sdmmc_lli_desc { u32 idmasize; }; -struct sdmmc_priv { +struct sdmmc_idma { dma_addr_t sg_dma; void *sg_cpu; }; @@ -92,7 +92,7 @@ static void sdmmc_idma_unprep_data(struct mmci_host *host, static int sdmmc_idma_setup(struct mmci_host *host) { - struct sdmmc_priv *idma; + struct sdmmc_idma *idma; idma = devm_kzalloc(mmc_dev(host->mmc), sizeof(*idma), GFP_KERNEL); if (!idma) @@ -123,7 +123,7 @@ static int sdmmc_idma_setup(struct mmci_host *host) static int sdmmc_idma_start(struct mmci_host *host, unsigned int *datactrl) { - struct sdmmc_priv *idma = host->dma_priv; + struct sdmmc_idma *idma = host->dma_priv; struct sdmmc_lli_desc *desc = (struct sdmmc_lli_desc *)idma->sg_cpu; struct mmc_data *data = host->data; struct scatterlist *sg;