* [PATCH] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user fails
@ 2012-11-14 6:32 Kumar Amit Mehta
2012-11-14 11:57 ` Alan Cox
0 siblings, 1 reply; 2+ messages in thread
From: Kumar Amit Mehta @ 2012-11-14 6:32 UTC (permalink / raw)
To: gregkh; +Cc: wfp5p, geert, devel, linux-kernel, kernel-janitors
This fix adds checks for inspecting the return value of put_user() and return
-EFAULT on error.
Signed-off-by: Kumar Amit Mehta <gmate.amit@gmail.com>
---
drivers/staging/dgrp/dgrp_tty.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/dgrp/dgrp_tty.c b/drivers/staging/dgrp/dgrp_tty.c
index e125b03..b294197 100644
--- a/drivers/staging/dgrp/dgrp_tty.c
+++ b/drivers/staging/dgrp/dgrp_tty.c
@@ -2265,7 +2265,8 @@ 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);
+ if (put_user(mlast, (unsigned int __user *) value))
+ return -EFAULT;
return 0;
}
@@ -2620,7 +2621,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 +2856,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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user fails
2012-11-14 6:32 [PATCH] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user fails Kumar Amit Mehta
@ 2012-11-14 11:57 ` Alan Cox
0 siblings, 0 replies; 2+ messages in thread
From: Alan Cox @ 2012-11-14 11:57 UTC (permalink / raw)
To: Kumar Amit Mehta
Cc: gregkh, wfp5p, geert, devel, linux-kernel, kernel-janitors
On Wed, 14 Nov 2012 12:02:21 +0530
Kumar Amit Mehta <gmate.amit@gmail.com> wrote:
> This fix adds checks for inspecting the return value of put_user() and return
> -EFAULT on error.
>
> Signed-off-by: Kumar Amit Mehta <gmate.amit@gmail.com>
> ---
> drivers/staging/dgrp/dgrp_tty.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/dgrp/dgrp_tty.c b/drivers/staging/dgrp/dgrp_tty.c
> index e125b03..b294197 100644
> --- a/drivers/staging/dgrp/dgrp_tty.c
> +++ b/drivers/staging/dgrp/dgrp_tty.c
> @@ -2265,7 +2265,8 @@ 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);
> + if (put_user(mlast, (unsigned int __user *) value))
> + return -EFAULT;
return put_user(mlast, ....)
is shorter and neater and does the same thing.
Alan
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-14 11:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-14 6:32 [PATCH] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user fails Kumar Amit Mehta
2012-11-14 11:57 ` Alan Cox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome