[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1352893057-27226-1-git-send-email-gmate.amit@gmail.com>
Date: Wed, 14 Nov 2012 17:07:37 +0530
From: Kumar Amit Mehta <gmate.amit@...il.com>
To: alan@...rguk.ukuu.org.uk
Cc: gregkh@...uxfoundation.org, wfp5p@...ginia.edu,
geert@...ux-m68k.org, devel@...verdev.osuosl.org,
linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org
Subject: [PATCH v2] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user fails
Inspect the return value of put_user() and return -EFAULT on error.
Signed-off-by: Kumar Amit Mehta <gmate.amit@...il.com>
---
drivers/staging/dgrp/dgrp_tty.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/dgrp/dgrp_tty.c b/drivers/staging/dgrp/dgrp_tty.c
index e125b03..cebd3a1 100644
--- a/drivers/staging/dgrp/dgrp_tty.c
+++ b/drivers/staging/dgrp/dgrp_tty.c
@@ -2265,9 +2265,7 @@ static int get_modem_info(struct ch_struct *ch, unsigned int *value)
| ((mlast & DM_RI) ? TIOCM_RNG : 0)
| ((mlast & DM_DSR) ? TIOCM_DSR : 0)
| ((mlast & DM_CTS) ? TIOCM_CTS : 0);
- put_user(mlast, (unsigned int __user *) value);
-
- return 0;
+ return put_user(mlast, (unsigned int __user *) value);
}
/*
@@ -2620,7 +2618,8 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
sizeof(long));
if (rc == 0)
return -EFAULT;
- put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) arg);
+ if (put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) arg))
+ return -EFAULT;
return 0;
case TIOCSSOFTCAR:
@@ -2854,7 +2853,8 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
rc = access_ok(VERIFY_WRITE, (void __user *) arg, sizeof(int));
if (rc == 0)
return -EFAULT;
- put_user(ch->ch_custom_speed, (unsigned int __user *) arg);
+ if (put_user(ch->ch_custom_speed, (unsigned int __user *) arg))
+ return -EFAULT;
break;
case DIGI_SETCUSTOMBAUD:
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists