From: Satyam Sharma <satyam.sharma@gmail.com>
Date: Mon, 16 Jul 2007 06:40:07 +0000 (-0700)
Subject: rocket.c: fix unchecked mutex_lock_interruptible()
X-Git-Tag: v2.6.23-rc1~925
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1e3e8d91fee56e1ab598b265466dc38033f1b915;p=~shefty%2Frdma-dev.git

rocket.c: fix unchecked mutex_lock_interruptible()

Check the return of mutex_lock_interruptible() in drivers/char/rocket.c and
return ERESTARTSYS if we were interrupted.

Signed-off-by: Satyam Sharma <satyam.sharma@gmail.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index a3fd7e7ba5a..0270080ff0c 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -1702,7 +1702,8 @@ static int rp_write(struct tty_struct *tty,
 	if (count <= 0 || rocket_paranoia_check(info, "rp_write"))
 		return 0;
 
-	mutex_lock_interruptible(&info->write_mtx);
+	if (mutex_lock_interruptible(&info->write_mtx))
+		return -ERESTARTSYS;
 
 #ifdef ROCKET_DEBUG_WRITE
 	printk(KERN_INFO "rp_write %d chars...", count);