Commit e6f59c4d authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] PCMCIA copy_*_user fixes.

These copies already did a verify_area above.
parent f7ef32d3
...@@ -689,7 +689,7 @@ static int ds_ioctl(struct inode * inode, struct file * file, ...@@ -689,7 +689,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
err = ret = 0; err = ret = 0;
if (cmd & IOC_IN) copy_from_user((char *)&buf, (char *)arg, size); if (cmd & IOC_IN) __copy_from_user((char *)&buf, (char *)arg, size);
switch (cmd) { switch (cmd) {
case DS_ADJUST_RESOURCE_INFO: case DS_ADJUST_RESOURCE_INFO:
...@@ -804,7 +804,7 @@ static int ds_ioctl(struct inode * inode, struct file * file, ...@@ -804,7 +804,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
} }
} }
if (cmd & IOC_OUT) copy_to_user((char *)arg, (char *)&buf, size); if (cmd & IOC_OUT) __copy_to_user((char *)arg, (char *)&buf, size);
return err; return err;
} /* ds_ioctl */ } /* ds_ioctl */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment