lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 29 Nov 2017 15:41:11 +0200 From: Adrian Hunter <adrian.hunter@...el.com> To: Ulf Hansson <ulf.hansson@...aro.org> Cc: linux-mmc <linux-mmc@...r.kernel.org>, linux-block <linux-block@...r.kernel.org>, linux-kernel <linux-kernel@...r.kernel.org>, Bough Chen <haibo.chen@....com>, Alex Lemberg <alex.lemberg@...disk.com>, Mateusz Nowak <mateusz.nowak@...el.com>, Yuliy Izrailov <Yuliy.Izrailov@...disk.com>, Jaehoon Chung <jh80.chung@...sung.com>, Dong Aisheng <dongas86@...il.com>, Das Asutosh <asutoshd@...eaurora.org>, Zhangfei Gao <zhangfei.gao@...il.com>, Sahitya Tummala <stummala@...eaurora.org>, Harjani Ritesh <riteshh@...eaurora.org>, Venu Byravarasu <vbyravarasu@...dia.com>, Linus Walleij <linus.walleij@...aro.org>, Shawn Lin <shawn.lin@...k-chips.com>, Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>, Christoph Hellwig <hch@....de> Subject: [PATCH V15 14/22] mmc: block: Check the timeout correctly in card_busy_detect() Pedantically, ensure the status is checked for the last time after the full timeout has passed. Signed-off-by: Adrian Hunter <adrian.hunter@...el.com> --- drivers/mmc/core/block.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index c446d17b48c4..f7c387c27ac0 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -931,6 +931,8 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms, u32 status; do { + bool done = time_after(jiffies, timeout); + err = __mmc_send_status(card, &status, 5); if (err) { pr_err("%s: error %d requesting status\n", @@ -951,7 +953,7 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms, * Timeout if the device never becomes ready for data and never * leaves the program state. */ - if (time_after(jiffies, timeout)) { + if (done) { pr_err("%s: Card stuck in programming state! %s %s\n", mmc_hostname(card->host), req->rq_disk->disk_name, __func__); -- 1.9.1
Powered by blists - more mailing lists