X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=blobdiff_plain;f=drivers%2Fblock%2Fps2esdi.c;h=82a5f19fd5d10467c319dcaac120a5237c2dabbe;hp=63e30e07f9b0ff16887788b4dc024bfcdcf173c1;hb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;hpb=c449269f45c2cdf53af08c8d0af37472f66539d9

diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
index 63e30e07f..82a5f19fd 100644
--- a/drivers/block/ps2esdi.c
+++ b/drivers/block/ps2esdi.c
@@ -180,7 +180,7 @@ static int sect[MAX_HD] = {-1, -1};
 MODULE_PARM(tp720esdi, "i");
 MODULE_PARM(cyl, "i");
 MODULE_PARM(head, "i");
-MODULE_PARM(track, "i");
+MODULE_PARM(sect, "i");
 MODULE_LICENSE("GPL");
 
 int init_module(void) {
@@ -1063,17 +1063,17 @@ static int ps2esdi_ioctl(struct inode *inode,
 			 struct file *file, u_int cmd, u_long arg)
 {
 	struct ps2esdi_i_struct *p = inode->i_bdev->bd_disk->private_data;
-	struct ps2esdi_geometry *geometry = (struct ps2esdi_geometry *) arg;
-	int err;
+	struct ps2esdi_geometry geom;
 
 	if (cmd != HDIO_GETGEO)
 		return -EINVAL;
-	if ((err = verify_area(VERIFY_WRITE, geometry, sizeof(*geometry))))
-		return (err);
-	put_user(p->head, (char *) &geometry->heads);
-	put_user(p->sect, (char *) &geometry->sectors);
-	put_user(p->cyl, (short *) &geometry->cylinders);
-	put_user(get_start_sect(inode->i_bdev), (long *) &geometry->start);
+	memset(&geom, 0, sizeof(geom));
+	geom.heads = p->head;
+	geom.sectors = p->sect;
+	geom.cylinders = p->cyl;
+	geom.start = get_start_sect(inode->i_bdev);
+	if (copy_to_user((void __user *)arg, &geom, sizeof(geom)))
+		return -EFAULT;
 	return 0;
 }