From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932938Ab0CKABO (ORCPT ); Wed, 10 Mar 2010 19:01:14 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:55855 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932928Ab0CKABM (ORCPT ); Wed, 10 Mar 2010 19:01:12 -0500 Date: Thu, 11 Mar 2010 11:01:10 +1100 From: Simon Horman To: H Hartley Sweeten Cc: Linux Kernel , greg@kroah.com, ss@aao.gov.au Subject: Re: [PATCH] staging/dt3155: make copy_{to/from}_user and put_user typesafe Message-ID: <20100311000109.GA12006@verge.net.au> References: <201003041020.19046.hartleys@visionengravers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201003041020.19046.hartleys@visionengravers.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 04, 2010 at 10:20:18AM -0700, H Hartley Sweeten wrote: > This makes the kernel to user space data transfers typesafe and removes > a number of unnecessary (void *) casts. Could you be more specific about what you mean by typesafe? There still seem to be casts in there. Although fewer than before :-) > Signed-off-by: H Hartley Sweeten > Cc: Greg Kroah-Hartman > Cc: Scott Smedley > > --- > > diff --git a/drivers/staging/dt3155/dt3155_drv.c b/drivers/staging/dt3155/dt3155_drv.c > index a67c622..76c9d94 100644 > --- a/drivers/staging/dt3155/dt3155_drv.c > +++ b/drivers/staging/dt3155/dt3155_drv.c > @@ -528,6 +528,7 @@ static int dt3155_ioctl(struct inode *inode, > unsigned long arg) > { > int minor = MINOR(inode->i_rdev); /* What device are we ioctl()'ing? */ > + void __user *up = (void __user *)arg; > > if ( minor >= MAXBOARDS || minor < 0 ) > return -ENODEV; > @@ -554,7 +555,7 @@ static int dt3155_ioctl(struct inode *inode, > > { > struct dt3155_config_s tmp; > - if (copy_from_user((void *)&tmp, (void *) arg, sizeof(tmp))) > + if (copy_from_user(&tmp, up, sizeof(tmp))) > return -EFAULT; > /* check for valid settings */ > if (tmp.rows > DT3155_MAX_ROWS || > @@ -572,8 +573,7 @@ static int dt3155_ioctl(struct inode *inode, > } > case DT3155_GET_CONFIG: > { > - if (copy_to_user((void *) arg, (void *) &dt3155_status[minor], > - sizeof(dt3155_status_t) )) > + if (copy_to_user(up, &dt3155_status[minor], sizeof(dt3155_status_t))) > return -EFAULT; > return 0; > } > @@ -593,8 +593,7 @@ static int dt3155_ioctl(struct inode *inode, > return 0; > > quick_stop(minor); > - if (copy_to_user((void *) arg, (void *) &dt3155_status[minor], > - sizeof(dt3155_status_t))) > + if (copy_to_user(up, &dt3155_status[minor], sizeof(dt3155_status_t))) > return -EFAULT; > return 0; > } > @@ -617,8 +616,7 @@ static int dt3155_ioctl(struct inode *inode, > } > > dt3155_init_isr(minor); > - if (copy_to_user( (void *) arg, (void *) &dt3155_status[minor], > - sizeof(dt3155_status_t))) > + if (copy_to_user(up, &dt3155_status[minor], sizeof(dt3155_status_t))) > return -EFAULT; > return 0; > } > @@ -819,11 +817,11 @@ static ssize_t dt3155_read(struct file *filep, char __user *buf, > /* make this an offset */ > offset = frame_info_p->addr - dt3155_status[minor].mem_addr; > > - put_user(offset, (unsigned int *) buf); > + put_user(offset, (unsigned int __user *)buf); > buf += sizeof(u32); > - put_user( dt3155_status[minor].fbuffer.frame_count, (unsigned int *) buf); > + put_user( dt3155_status[minor].fbuffer.frame_count, (unsigned int __user *)buf); > buf += sizeof(u32); > - put_user(dt3155_status[minor].state, (unsigned int *) buf); > + put_user(dt3155_status[minor].state, (unsigned int __user *)buf); > buf += sizeof(u32); > if (copy_to_user(buf, frame_info_p, sizeof(frame_info_t))) > return -EFAULT; > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/