From: Dan Carpenter <dan.carpenter@oracle.com>
To: Kumar Amit Mehta <gmate.amit@gmail.com>
Cc: alan@lxorguk.ukuu.org.uk, gregkh@linuxfoundation.org,
wfp5p@virginia.edu, geert@linux-m68k.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH v2] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user fails
Date: Wed, 14 Nov 2012 17:55:12 +0000 [thread overview]
Message-ID: <20121114175512.GJ11515@mwanda> (raw)
In-Reply-To: <1352893057-27226-1-git-send-email-gmate.amit@gmail.com>
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@gmail.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;
This one could just be return put_user() as well.
regards,
dan carpenter
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Kumar Amit Mehta <gmate.amit@gmail.com>
Cc: alan@lxorguk.ukuu.org.uk, gregkh@linuxfoundation.org,
wfp5p@virginia.edu, geert@linux-m68k.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH v2] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user fails
Date: Wed, 14 Nov 2012 20:55:12 +0300 [thread overview]
Message-ID: <20121114175512.GJ11515@mwanda> (raw)
In-Reply-To: <1352893057-27226-1-git-send-email-gmate.amit@gmail.com>
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@gmail.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;
This one could just be return put_user() as well.
regards,
dan carpenter
next prev parent reply other threads:[~2012-11-14 17:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-14 11:37 [PATCH v2] staging: dgrp: dgrp_tty.c: return an -EFAULT if put_user fails Kumar Amit Mehta
2012-11-14 11:49 ` Kumar Amit Mehta
2012-11-14 17:55 ` Dan Carpenter [this message]
2012-11-14 17:55 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121114175512.GJ11515@mwanda \
--to=dan.carpenter@oracle.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=devel@driverdev.osuosl.org \
--cc=geert@linux-m68k.org \
--cc=gmate.amit@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wfp5p@virginia.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.