| From 0d319dd5a27183b75d984e3dc495248e59f99334 Mon Sep 17 00:00:00 2001 |
| From: Yann Gautier <yann.gautier@foss.st.com> |
| Date: Thu, 17 Mar 2022 12:19:43 +0100 |
| Subject: mmc: mmci: stm32: correctly check all elements of sg list |
| |
| From: Yann Gautier <yann.gautier@foss.st.com> |
| |
| commit 0d319dd5a27183b75d984e3dc495248e59f99334 upstream. |
| |
| Use sg and not data->sg when checking sg list elements. Else only the |
| first element alignment is checked. |
| The last element should be checked the same way, for_each_sg already set |
| sg to sg_next(sg). |
| |
| Fixes: 46b723dd867d ("mmc: mmci: add stm32 sdmmc variant") |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Yann Gautier <yann.gautier@foss.st.com> |
| Link: https://lore.kernel.org/r/20220317111944.116148-2-yann.gautier@foss.st.com |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/mmc/host/mmci_stm32_sdmmc.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/mmc/host/mmci_stm32_sdmmc.c |
| +++ b/drivers/mmc/host/mmci_stm32_sdmmc.c |
| @@ -62,8 +62,8 @@ static int sdmmc_idma_validate_data(stru |
| * excepted the last element which has no constraint on idmasize |
| */ |
| for_each_sg(data->sg, sg, data->sg_len - 1, i) { |
| - if (!IS_ALIGNED(data->sg->offset, sizeof(u32)) || |
| - !IS_ALIGNED(data->sg->length, SDMMC_IDMA_BURST)) { |
| + if (!IS_ALIGNED(sg->offset, sizeof(u32)) || |
| + !IS_ALIGNED(sg->length, SDMMC_IDMA_BURST)) { |
| dev_err(mmc_dev(host->mmc), |
| "unaligned scatterlist: ofst:%x length:%d\n", |
| data->sg->offset, data->sg->length); |
| @@ -71,7 +71,7 @@ static int sdmmc_idma_validate_data(stru |
| } |
| } |
| |
| - if (!IS_ALIGNED(data->sg->offset, sizeof(u32))) { |
| + if (!IS_ALIGNED(sg->offset, sizeof(u32))) { |
| dev_err(mmc_dev(host->mmc), |
| "unaligned last scatterlist: ofst:%x length:%d\n", |
| data->sg->offset, data->sg->length); |