[PATCH] sparse: more wan annotations

diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index dd6f0ff29cedc3a6109eabca609c3fb3b62d3258..bad0d418580be6aa5bf4e1833f262dafa66ca90f 100644 (file)
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -454,7 +454,7 @@ static int dlci_del(struct dlci_add *dlci)
        return(err);
 }
 
-static int dlci_ioctl(unsigned int cmd, void *arg)
+static int dlci_ioctl(unsigned int cmd, void __user *arg)
 {
        struct dlci_add add;
        int err;

diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 50590033559e5abe2e28d1d592bc33366f538c8e..3c94b1736570157b0e81d87c6ec86640305e1633 100644 (file)
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -191,7 +191,7 @@ struct frad_local
    int               buffer;           /* current buffer for S508 firmware */
 };
 
-extern void dlci_ioctl_set(int (*hook)(unsigned int, void *));
+extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *));
 
 #endif /* __KERNEL__ */
 

diff --git a/include/linux/sdla.h b/include/linux/sdla.h
index 44ae55b1c4275af00080130b2aaaeb090fa626b6..3b6afb8caa4234447f504d38ba1eeb19e9ebab00 100644 (file)
--- a/include/linux/sdla.h
+++ b/include/linux/sdla.h
@@ -58,7 +58,7 @@
 struct sdla_mem {
    int  addr;
    int  len;
-   void *data;
+   void __user *data;
 };
 
 #define SDLA_START                     (FRAD_LAST_IOCTL + 7)

diff --git a/net/socket.c b/net/socket.c
index b10023d9eefd798d88c830f90a6f3b2a074be78c..d3ec3873277ad1d9478e06e73c0bde5b13e46eb6 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -751,9 +751,9 @@ void vlan_ioctl_set(int (*hook)(void __user *))
 EXPORT_SYMBOL(vlan_ioctl_set);
 
 static DECLARE_MUTEX(dlci_ioctl_mutex);
-static int (*dlci_ioctl_hook)(unsigned int, void *);
+static int (*dlci_ioctl_hook)(unsigned int, void __user *);
 
-void dlci_ioctl_set(int (*hook)(unsigned int, void *))
+void dlci_ioctl_set(int (*hook)(unsigned int, void __user *))
 {
        down(&dlci_ioctl_mutex);
        dlci_ioctl_hook = hook;
@@ -832,7 +832,7 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 
                        if (dlci_ioctl_hook) {
                                down(&dlci_ioctl_mutex);
-                               err = dlci_ioctl_hook(cmd, (void *)arg);
+                               err = dlci_ioctl_hook(cmd, argp);
                                up(&dlci_ioctl_mutex);
                        }
                        break;