Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfa87d9a authored by Yann Gautier's avatar Yann Gautier Committed by Greg Kroah-Hartman
Browse files

mmc: mmci: stm32: correctly check all elements of sg list 



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: 46b723dd ("mmc: mmci: add stm32 sdmmc variant")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarYann Gautier <yann.gautier@foss.st.com>
Link: https://lore.kernel.org/r/20220317111944.116148-2-yann.gautier@foss.st.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c645de49

drivers/mmc/host/mmci_stm32_sdmmc.c

+3 −3
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ int sdmmc_idma_validate_data(struct mmci_host *host, 
	 * 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);
@@ -45,7 +45,7 @@ int sdmmc_idma_validate_data(struct mmci_host *host, 
		}

	}



	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);