| From 8612ed0d97abcf1c016d34755b7cf2060de71963 Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Fri, 23 Aug 2013 11:40:59 +0300 |
| Subject: watchdog: ts72xx_wdt: locking bug in ioctl |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| commit 8612ed0d97abcf1c016d34755b7cf2060de71963 upstream. |
| |
| Calling the WDIOC_GETSTATUS & WDIOC_GETBOOTSTATUS and twice will cause a |
| interruptible deadlock. |
| |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Reviewed-by: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Wim Van Sebroeck <wim@iguana.be> |
| Cc: Jonghwan Choi <jhbird.choi@samsung.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/watchdog/ts72xx_wdt.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/watchdog/ts72xx_wdt.c |
| +++ b/drivers/watchdog/ts72xx_wdt.c |
| @@ -310,7 +310,8 @@ static long ts72xx_wdt_ioctl(struct file |
| |
| case WDIOC_GETSTATUS: |
| case WDIOC_GETBOOTSTATUS: |
| - return put_user(0, p); |
| + error = put_user(0, p); |
| + break; |
| |
| case WDIOC_KEEPALIVE: |
| ts72xx_wdt_kick(wdt); |
