2012-11-15 12:16:15

by Kumar Amit Mehta

Subject: [PATCH v3] 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 <[email protected]>
---
drivers/staging/dgrp/dgrp_tty.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/dgrp/dgrp_tty.c b/drivers/staging/dgrp/dgrp_tty.c
index e125b03..bc14479 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,8 +2618,7 @@ 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);
- return 0;
+ return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) arg);

case TIOCSSOFTCAR:
get_user(arg, (unsigned long __user *) arg);
@@ -2854,7 +2851,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

2012-11-15 23:26:05

by Greg Kroah-Hartman

Subject: Re: [PATCH v3] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user() fails

On Thu, Nov 15, 2012 at 05:45:32PM +0530, Kumar Amit Mehta wrote:
> Inspect the return value of put_user() and return -EFAULT on error.
>
> Signed-off-by: Kumar Amit Mehta <[email protected]>

This no longer applies to my tree, care to refresh and try again?

thanks,

greg k-h