4.9-stable patches

added patches:
	mmc-core-limit-retries-when-analyse-of-sdio-tuples-fails.patch

diff --git a/queue-4.9/mmc-core-limit-retries-when-analyse-of-sdio-tuples-fails.patch b/queue-4.9/mmc-core-limit-retries-when-analyse-of-sdio-tuples-fails.patch
new file mode 100644 (file)
index 0000000..0720a0c
--- /dev/null
+++ b/queue-4.9/mmc-core-limit-retries-when-analyse-of-sdio-tuples-fails.patch
@@ -0,0 +1,50 @@
+From f92e04f764b86e55e522988e6f4b6082d19a2721 Mon Sep 17 00:00:00 2001
+From: Fengnan Chang <fengnanchang@gmail.com>
+Date: Sat, 23 Jan 2021 11:32:31 +0800
+Subject: mmc: core: Limit retries when analyse of SDIO tuples fails
+
+From: Fengnan Chang <fengnanchang@gmail.com>
+
+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: Fengnan Chang <fengnanchang@gmail.com>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/20210123033230.36442-1-fengnanchang@gmail.com
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mmc/core/sdio_cis.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/mmc/core/sdio_cis.c
++++ b/drivers/mmc/core/sdio_cis.c
+@@ -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
+ 
+       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
+                       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",

diff --git a/queue-4.9/series b/queue-4.9/series
index 6de4f1ee9404bf3fbdb66f0220ed0ff90ef213cb..40c30f79facc42ddca5d32a1f7ecacdb065895f8 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -29,3 +29,4 @@ mac80211-fix-station-rate-table-updates-on-assoc.patch
 kretprobe-avoid-re-registration-of-the-same-kretprobe-earlier.patch
 xhci-fix-bounce-buffer-usage-for-non-sg-list-case.patch
 cifs-report-error-instead-of-invalid-when-revalidating-a-dentry-fails.patch
+mmc-core-limit-retries-when-analyse-of-sdio-tuples-fails.patch