Re: [PATCH v2] staging: dgrp: dgrp_tty.c: return an -EFAULT ifput_user fails

[Dan Carpenter]

On Wed, Nov 14, 2012 at 05:07:37PM +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@xxxxxxxxx>
> ---
>  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;

This one could just be return put_user() as well.

regards,
dan carpenter

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/