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

Commit 0c1b6b22 authored by Fengnan Chang's avatar Fengnan Chang Committed by Greg Kroah-Hartman
Browse files

mmc: core: Limit retries when analyse of SDIO tuples fails 



commit f92e04f764b86e55e522988e6f4b6082d19a2721 upstream.

When analysing tuples fails we may loop indefinitely to retry. Let's avoid
this by using a 10s timeout and bail if not completed earlier.

Signed-off-by: default avatarFengnan Chang <fengnanchang@gmail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210123033230.36442-1-fengnanchang@gmail.com


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

drivers/mmc/core/sdio_cis.c

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include "sdio_cis.h"

#include "sdio_ops.h"



#define SDIO_READ_CIS_TIMEOUT_MS  (10 * 1000) /* 10s */



static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func,

			 const unsigned char *buf, unsigned size)

{
@@ -269,6 +271,8 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func) 


	do {

		unsigned char tpl_code, tpl_link;

		unsigned long timeout = jiffies +

			msecs_to_jiffies(SDIO_READ_CIS_TIMEOUT_MS);



		ret = mmc_io_rw_direct(card, 0, 0, ptr++, 0, &tpl_code);

		if (ret)
@@ -321,6 +325,8 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func) 
			prev = &this->next;



			if (ret == -ENOENT) {

				if (time_after(jiffies, timeout))

					break;

				/* warn about unknown tuples */

				pr_warn_ratelimited("%s: queuing unknown"

				       " CIS tuple 0x%02x (%u bytes)\n",