linux-kernel - Re: [patch 1/2] ptp: return -EFAULT on copy_to

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 30 May 2011 08:12:38 +0200
From:	Richard Cochran <richardcochran@...il.com>
To:	Dan Carpenter <error27@...il.com>
Cc:	Richard Cochran <richard.cochran@...cron.at>,
	"David S. Miller" <davem@...emloft.net>,
	John Stultz <john.stultz@...aro.org>,
	Arnd Bergmann <arnd@...db.de>,
	open list <linux-kernel@...r.kernel.org>,
	kernel-janitors@...r.kernel.org,
	Thomas Gleixner <tglx@...utronix.de>
Subject: Re: [patch 1/2] ptp: return -EFAULT on copy_to_user() errors

On Sun, May 29, 2011 at 10:53:12PM +0300, Dan Carpenter wrote:
> copy_to_user() returns the number of bytes remaining, but we want a
> negative error code here.
> 
> Signed-off-by: Dan Carpenter <error27@...il.com>
> 
> diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
> index a8d03ae..93fa22d 100644
> --- a/drivers/ptp/ptp_chardev.c
> +++ b/drivers/ptp/ptp_chardev.c
> @@ -46,7 +46,8 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
>  		caps.n_ext_ts = ptp->info->n_ext_ts;
>  		caps.n_per_out = ptp->info->n_per_out;
>  		caps.pps = ptp->info->pps;
> -		err = copy_to_user((void __user *)arg, &caps, sizeof(caps));
> +		if (copy_to_user((void __user *)arg, &caps, sizeof(caps)))
> +			err = -EFAULT;

Yes, right, and thanks for the extra review.

Thomas, can you please queue these two patches for 3.0-rc2?

(Or should John Stultz handle this sort of thing?)

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