From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Dan Carpenter <dan.carpenter@oracle.com>,
Guenter Roeck <linux@roeck-us.net>,
Wim Van Sebroeck <wim@iguana.be>,
Jonghwan Choi <jhbird.choi@samsung.com>
Subject: [ 5/7] watchdog: ts72xx_wdt: locking bug in ioctl
Date: Fri, 18 Oct 2013 12:52:52 -0700 [thread overview]
Message-ID: <20131018195036.393771654@linuxfoundation.org> (raw)
In-Reply-To: <20131018195036.020644622@linuxfoundation.org>
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
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);
next prev parent reply other threads:[~2013-10-18 19:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-18 19:52 [ 0/7] 3.0.101-stable review Greg Kroah-Hartman
2013-10-18 19:52 ` [ 1/7] random: run random_int_secret_init() run after all late_initcalls Greg Kroah-Hartman
2013-10-18 19:52 ` [ 2/7] vfs: allow O_PATH file descriptors for fstatfs() Greg Kroah-Hartman
2013-10-18 19:52 ` [ 3/7] ext4: fix memory leak in xattr Greg Kroah-Hartman
2013-10-21 21:30 ` Felipe Pena
2013-10-18 19:52 ` [ 4/7] parisc: fix interruption handler to respect pagefault_disable() Greg Kroah-Hartman
2013-10-18 19:52 ` Greg Kroah-Hartman [this message]
2013-10-18 19:52 ` [ 6/7] drm/radeon: fix hw contexts for SUMO2 asics Greg Kroah-Hartman
2013-10-18 19:52 ` [ 7/7] ipv6: tcp: fix panic in SYN processing Greg Kroah-Hartman
2013-10-19 0:08 ` [ 0/7] 3.0.101-stable review Steven Rostedt
2013-10-19 0:19 ` Guenter Roeck
2013-10-19 4:49 ` Greg Kroah-Hartman
2013-10-19 3:39 ` Shuah Khan
2013-10-19 4:49 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131018195036.393771654@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=dan.carpenter@oracle.com \
--cc=jhbird.choi@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=stable@vger.kernel.org \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).