Skip to content

Commit

Permalink
[PATCH] __user annotations (scsi/ch)
Browse files Browse the repository at this point in the history 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
viro@ZenIV.linux.org.uk authored and Linus Torvalds committed Sep 10, 2005
1 parent b35b707 commit fe08ac3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
27 changes: 14 additions & 13 deletions drivers/scsi/ch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ ch_set_voltag(scsi_changer *ch, u_int elem,
return result;
}

static int ch_gstatus(scsi_changer *ch, int type, unsigned char *dest)
static int ch_gstatus(scsi_changer *ch, int type, unsigned char __user *dest)
{
int retval = 0;
u_char data[16];
Expand Down Expand Up @@ -634,6 +634,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
{
scsi_changer *ch = file->private_data;
int retval;
void __user *argp = (void __user *)arg;

switch (cmd) {
case CHIOGPARAMS:
Expand All @@ -646,7 +647,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
params.cp_nportals = ch->counts[CHET_IE];
params.cp_ndrives = ch->counts[CHET_DT];

if (copy_to_user((void *) arg, &params, sizeof(params)))
if (copy_to_user(argp, &params, sizeof(params)))
return -EFAULT;
return 0;
}
Expand All @@ -671,7 +672,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
vparams.cvp_n4 = ch->counts[CHET_V4];
strncpy(vparams.cvp_label4,vendor_labels[3],16);
}
if (copy_to_user((void *) arg, &vparams, sizeof(vparams)))
if (copy_to_user(argp, &vparams, sizeof(vparams)))
return -EFAULT;
return 0;
}
Expand All @@ -680,7 +681,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
{
struct changer_position pos;

if (copy_from_user(&pos, (void*)arg, sizeof (pos)))
if (copy_from_user(&pos, argp, sizeof (pos)))
return -EFAULT;

if (0 != ch_checkrange(ch, pos.cp_type, pos.cp_unit)) {
Expand All @@ -699,7 +700,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
{
struct changer_move mv;

if (copy_from_user(&mv, (void*)arg, sizeof (mv)))
if (copy_from_user(&mv, argp, sizeof (mv)))
return -EFAULT;

if (0 != ch_checkrange(ch, mv.cm_fromtype, mv.cm_fromunit) ||
Expand All @@ -721,7 +722,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
{
struct changer_exchange mv;

if (copy_from_user(&mv, (void*)arg, sizeof (mv)))
if (copy_from_user(&mv, argp, sizeof (mv)))
return -EFAULT;

if (0 != ch_checkrange(ch, mv.ce_srctype, mv.ce_srcunit ) ||
Expand All @@ -746,7 +747,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
{
struct changer_element_status ces;

if (copy_from_user(&ces, (void*)arg, sizeof (ces)))
if (copy_from_user(&ces, argp, sizeof (ces)))
return -EFAULT;
if (ces.ces_type < 0 || ces.ces_type >= CH_TYPES)
return -EINVAL;
Expand All @@ -762,7 +763,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
unsigned int elem;
int result,i;

if (copy_from_user(&cge, (void*)arg, sizeof (cge)))
if (copy_from_user(&cge, argp, sizeof (cge)))
return -EFAULT;

if (0 != ch_checkrange(ch, cge.cge_type, cge.cge_unit))
Expand Down Expand Up @@ -825,7 +826,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
kfree(buffer);
up(&ch->lock);

if (copy_to_user((void*)arg, &cge, sizeof (cge)))
if (copy_to_user(argp, &cge, sizeof (cge)))
return -EFAULT;
return result;
}
Expand All @@ -843,7 +844,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
struct changer_set_voltag csv;
int elem;

if (copy_from_user(&csv, (void*)arg, sizeof(csv)))
if (copy_from_user(&csv, argp, sizeof(csv)))
return -EFAULT;

if (0 != ch_checkrange(ch, csv.csv_type, csv.csv_unit)) {
Expand All @@ -861,7 +862,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
}

default:
return scsi_ioctl(ch->device, cmd, (void*)arg);
return scsi_ioctl(ch->device, cmd, argp);

}
}
Expand Down Expand Up @@ -894,9 +895,9 @@ static long ch_ioctl_compat(struct file * file,
case CHIOGSTATUS32:
{
struct changer_element_status32 ces32;
unsigned char *data;
unsigned char __user *data;

if (copy_from_user(&ces32, (void*)arg, sizeof (ces32)))
if (copy_from_user(&ces32, (void __user *)arg, sizeof (ces32)))
return -EFAULT;
if (ces32.ces_type < 0 || ces32.ces_type >= CH_TYPES)
return -EINVAL;
Expand Down
2 changes: 1 addition & 1 deletion include/linux/chio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct changer_position {
*/
struct changer_element_status {
int ces_type;
unsigned char *ces_data;
unsigned char __user *ces_data;
};
#define CESTATUS_FULL 0x01 /* full */
#define CESTATUS_IMPEXP 0x02 /* media was imported (inserted by sysop) */
Expand Down

0 comments on commit fe08ac3

Please sign in to comment.