Patch "mmc: atmel-mci: fix bad variable type for clkdiv" has been added to the 3.14-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
mmc: atmel-mci: fix bad variable type for clkdiv
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mmc-atmel-mci-fix-bad-variable-type-for-clkdiv.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
60c8f783a18feb95ad967c87e9660caf09fb4700Mon Sep 17 00:00:00 2001
From: Ludovic Desroches <[email protected]>
Date: Wed, 6 May 2015 15:16:46 +0200
Subject: mmc: atmel-mci: fix bad variable type for clkdiv
From: Ludovic Desroches <[email protected]>
commit 60c8f783a18feb95ad967c87e9660caf09fb4700 upstream.
clkdiv is declared as an u32 but it can be set to a negative value causing a huge divisor value. Change its type to int to avoid this case.
--- drivers/mmc/host/atmel-mci.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/mmc/host/atmel-mci.c +7 -2
@@ -1300,7 +1300,7 @@ static void atmci_set_ios(struct mmc_hosif (ios->clock) {unsigned int clock_min = ~0U ; -u32 clkdiv; +int clkdiv;clk_prepare (host->mck); unprepare_clk = true;
@@ -1329,7 +1329,12 @@ static void atmci_set_ios(struct mmc_hos/* Calculate clock divider */ if (host->caps.has_odd_clk_div) { clkdiv =DIV_ROUND_UP (host->bus_hz, clock_min) -2 ; -if (clkdiv >511 ) { +if (clkdiv <0 ) { +dev_warn (&mmc->class_dev, +"clock %u too fast; using %lu\n" , + clock_min, host->bus_hz /2 ); + clkdiv =0 ; + }else if (clkdiv >511 ) {dev_warn (&mmc->class_dev,"clock %u too slow; using %lu\n" , clock_min, host->bus_hz / (511 +2 ));
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/mmc-atmel-mci-fix-bad-variable-type-for-clkdiv.patch