tmio_mmc_pio: prevent endless loop in tmio_mmc_set_clock()
Subsystems (2)
PATCH v4 1/1 tmio_mmc_pio: prevent endless loop in tmio_mmc_set_clock()
I spent a couple of days with the driver just hanging due to me forgetting to specify the external crystal frequency, so that clk_get_rate() returned 0 and thus the loop in tmio_mmc_set_clock() never ended. I don't think that's an acceptable behavior, so I suggest that the minimum frequency is checked for 0 in tmio_mmc_host_probe().
---
The patch is against Ulf Hansson's 'mmc.git' repo's 'next' branch.
Changes in version 4:
- rebased to the 'next' branch, resolving reject;
- added Ian Molton's ACK.
Changes in version 3:
- added Cc: stable.
Changes in version 2:
- fixed grammar in the changelog.
drivers/mmc/host/tmio_mmc_pio.c | 9 +++++++++ 1 file changed, 9 insertions(+)
Index: mmc/drivers/mmc/host/tmio_mmc_pio.c =================================--- mmc.orig/drivers/mmc/host/tmio_mmc_pio.c +++ mmc/drivers/mmc/host/tmio_mmc_pio.c
@@ -1091,6 +1091,15 @@ int tmio_mmc_host_probe(struct tmio_mmc_
}
/*
+ * Check the sanity of mmc->f_min to prevent tmio_mmc_set_clock() from
+ * looping forever...
+ */
+ if (mmc->f_min = 0) {
+ ret = -EINVAL;
+ goto host_free;
+ }
+
+ /*
* While using internal tmio hardware logic for card detection, we need
* to ensure it stays powered for it to work.
*/
Ulf Hansson
AppliedQuoted 9 lines · Sergei Shtylyov
I spent a couple of days with the driver just hanging due to me forgetting to specify the external crystal frequency, so that
clk_get_rate()returned 0 and thus the loop intmio_mmc_set_clock()never ended. I don't think that's an acceptable behavior, so I suggest that the minimum frequency is checked for 0 intmio_mmc_host_probe().Signed-off-by Sergei Shtylyov <[email protected]>Acked-by Ian Molton <[email protected]>
Thanks! Applied for next with a smaller change - adding a "mmc" prefix for the commit message subject.
Kind regards
Uffe
Quoted 37 lines
---
The patch is against Ulf Hansson's 'mmc.git' repo's 'next' branch.Changes in version 4:
- rebased to the 'next' branch, resolving reject;
- added Ian Molton's ACK.Changes in version 3:
- added Cc: stable.Changes in version 2:
- fixed grammar in the changelog.drivers/mmc/host/tmio_mmc_pio.c | 9 +++++++++ 1 file changed, 9 insertions(+)Index:
mmc/drivers/mmc/host/tmio_mmc_pio.c=================================> ---mmc.orig/drivers/mmc/host/tmio_mmc_pio.c+++mmc/drivers/mmc/host/tmio_mmc_pio.c(quoted diff) +9
-0@@ -1091,6 +1091,15 @@ int tmio_mmc_host_probe(struct tmio_mmc_ } /* + * Check the sanity of mmc->f_min to prevent tmio_mmc_set_clock() from + * looping forever... + */ + if (mmc->f_min = 0) { + ret = -EINVAL; + goto host_free; + } + + /* * While using internal tmio hardware logic for card detection, we need * to ensure it stays powered for it to work. */