linux-kernel - [PATCH V2 1/2] bdisp: Fix a possible sleep-in-atomic bug in bdisp_hw

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

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1513425251-4143-1-git-send-email-baijiaju1990@gmail.com>
Date:   Sat, 16 Dec 2017 19:54:11 +0800
From:   Jia-Ju Bai <baijiaju1990@...il.com>
To:     fabien.dessenne@...com, hverkuil@...all.nl,
        benjamin.gaignard@...com, mchehab@...nel.org
Cc:     linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
        Jia-Ju Bai <baijiaju1990@...il.com>
Subject: [PATCH V2 1/2] bdisp: Fix a possible sleep-in-atomic bug in bdisp_hw_reset

The driver may sleep under a spinlock.
The function call path is:
bdisp_device_run (acquire the spinlock)
  bdisp_hw_reset
    msleep --> may sleep

To fix it, readl_poll_timeout_atomic is used to replace msleep.

This bug is found by my static analysis tool(DSAC) and 
checked by my code review.

Signed-off-by: Jia-Ju Bai <baijiaju1990@...il.com>
---
 drivers/media/platform/sti/bdisp/bdisp-hw.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/media/platform/sti/bdisp/bdisp-hw.c b/drivers/media/platform/sti/bdisp/bdisp-hw.c
index b7892f3..e94a371 100644
--- a/drivers/media/platform/sti/bdisp/bdisp-hw.c
+++ b/drivers/media/platform/sti/bdisp/bdisp-hw.c
@@ -5,6 +5,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/iopoll.h>
 
 #include "bdisp.h"
 #include "bdisp-filter.h"
@@ -366,7 +367,7 @@ struct bdisp_filter_addr {
  */
 int bdisp_hw_reset(struct bdisp_dev *bdisp)
 {
-	unsigned int i;
+	u32 tmp;
 
 	dev_dbg(bdisp->dev, "%s\n", __func__);
 
@@ -379,15 +380,14 @@ int bdisp_hw_reset(struct bdisp_dev *bdisp)
 	writel(0, bdisp->regs + BLT_CTL);
 
 	/* Wait for reset done */
-	for (i = 0; i < POLL_RST_MAX; i++) {
-		if (readl(bdisp->regs + BLT_STA1) & BLT_STA1_IDLE)
-			break;
-		msleep(POLL_RST_DELAY_MS);
-	}
-	if (i == POLL_RST_MAX)
+	if (readl_poll_timeout_atomic(bdisp->regs + BLT_STA1, tmp,
+		(tmp & BLT_STA1_IDLE), POLL_RST_DELAY_MS,
+			POLL_RST_DELAY_MS * POLL_RST_MAX)) {
 		dev_err(bdisp->dev, "Reset timeout\n");
+		return -EAGAIN;
+	}
 
-	return (i == POLL_RST_MAX) ? -EAGAIN : 0;
+	return 0;
 }
 
 /**
-- 
1.7.9.5