From 96dff59da696e14e49bb8c45c3e2cf8794a22140 Mon Sep 17 00:00:00 2001 From: Alexander Viro Date: Fri, 4 Jun 2004 00:11:02 -0700 Subject: [PATCH] [PATCH] sparse: drivers/net/tun.c annotation --- drivers/net/tun.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index e6df23feaacc8..51f33a567e1ea 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -241,10 +241,10 @@ static ssize_t tun_chr_writev(struct file * file, const struct iovec *iv, } /* 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) { - struct iovec iv = { (void *) buf, count }; + struct iovec iv = { (void __user *) buf, count }; 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, } /* 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) { struct iovec iv = { buf, count }; @@ -462,7 +462,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file, struct ifreq ifr; int err; - if (copy_from_user(&ifr, (void *)arg, sizeof(ifr))) + if (copy_from_user(&ifr, (void __user *)arg, sizeof(ifr))) return -EFAULT; ifr.ifr_name[IFNAMSIZ-1] = '\0'; @@ -473,7 +473,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file, if (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 0; } -- 2.53.0