Commit 96dff59d authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] sparse: drivers/net/tun.c annotation

parent 090014ee
...@@ -241,10 +241,10 @@ static ssize_t tun_chr_writev(struct file * file, const struct iovec *iv, ...@@ -241,10 +241,10 @@ static ssize_t tun_chr_writev(struct file * file, const struct iovec *iv,
} }
/* Write */ /* Write */
static ssize_t tun_chr_write(struct file * file, const char * buf, static ssize_t tun_chr_write(struct file * file, const char __user * buf,
size_t count, loff_t *pos) size_t count, loff_t *pos)
{ {
struct iovec iv = { (void *) buf, count }; struct iovec iv = { (void __user *) buf, count };
return tun_chr_writev(file, &iv, 1, pos); return tun_chr_writev(file, &iv, 1, pos);
} }
...@@ -333,7 +333,7 @@ static ssize_t tun_chr_readv(struct file *file, const struct iovec *iv, ...@@ -333,7 +333,7 @@ static ssize_t tun_chr_readv(struct file *file, const struct iovec *iv,
} }
/* Read */ /* Read */
static ssize_t tun_chr_read(struct file * file, char * buf, static ssize_t tun_chr_read(struct file * file, char __user * buf,
size_t count, loff_t *pos) size_t count, loff_t *pos)
{ {
struct iovec iv = { buf, count }; struct iovec iv = { buf, count };
...@@ -462,7 +462,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file, ...@@ -462,7 +462,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
struct ifreq ifr; struct ifreq ifr;
int err; int err;
if (copy_from_user(&ifr, (void *)arg, sizeof(ifr))) if (copy_from_user(&ifr, (void __user *)arg, sizeof(ifr)))
return -EFAULT; return -EFAULT;
ifr.ifr_name[IFNAMSIZ-1] = '\0'; ifr.ifr_name[IFNAMSIZ-1] = '\0';
...@@ -473,7 +473,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file, ...@@ -473,7 +473,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
if (err) if (err)
return err; return err;
if (copy_to_user((void *)arg, &ifr, sizeof(ifr))) if (copy_to_user((void __user *)arg, &ifr, sizeof(ifr)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
......
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