All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user() fails
@ 2012-11-15 12:27 ` Kumar Amit Mehta
  0 siblings, 0 replies; 4+ messages in thread
From: Kumar Amit Mehta @ 2012-11-15 12:15 UTC (permalink / raw)
  To: gregkh
  Cc: alan, dan.carpenter, wfp5p, geert, devel, linux-kernel, kernel-janitors

Inspect 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 |   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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH v3] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user() fails
@ 2012-11-15 12:27 ` Kumar Amit Mehta
  0 siblings, 0 replies; 4+ messages in thread
From: Kumar Amit Mehta @ 2012-11-15 12:27 UTC (permalink / raw)
  To: gregkh
  Cc: alan, dan.carpenter, wfp5p, geert, devel, linux-kernel, kernel-janitors

Inspect 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 |   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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH v3] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user() fails
  2012-11-15 12:27 ` Kumar Amit Mehta
@ 2012-11-15 23:25   ` Greg KH
  -1 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2012-11-15 23:25 UTC (permalink / raw)
  To: Kumar Amit Mehta
  Cc: devel, kernel-janitors, linux-kernel, geert, alan, dan.carpenter

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 <gmate.amit@gmail.com>

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

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v3] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user() fails
@ 2012-11-15 23:25   ` Greg KH
  0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2012-11-15 23:25 UTC (permalink / raw)
  To: Kumar Amit Mehta
  Cc: devel, kernel-janitors, linux-kernel, geert, alan, dan.carpenter

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 <gmate.amit@gmail.com>

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

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-11-15 23:26 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-15 12:15 [PATCH v3] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user() fails Kumar Amit Mehta
2012-11-15 12:27 ` Kumar Amit Mehta
2012-11-15 23:25 ` Greg KH
2012-11-15 23:25   ` Greg KH

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.