diff options
| author | Arjan van de Ven <arjanv@redhat.com> | 2004-04-15 23:56:23 -0700 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@osdl.org> | 2004-04-15 23:56:23 -0700 |
| commit | 64b0f9e29e5a4b02077d0d048865e7bd44036715 (patch) | |
| tree | 70d9c5064bcda634f427ad85508a00dddf6eb146 /include/linux | |
| parent | ea38ba8c40b4b81991112d792387d739951bbd1f (diff) | |
[NET]: Add some sparse annotations to network driver stack.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/divert.h | 4 | ||||
| -rw-r--r-- | include/linux/if.h | 2 | ||||
| -rw-r--r-- | include/linux/wireless.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/divert.h b/include/linux/divert.h index 38497a643657..e11c909eb7f7 100644 --- a/include/linux/divert.h +++ b/include/linux/divert.h @@ -46,7 +46,7 @@ typedef union _divert_cf_arg u32 uint32; s64 int64; u64 uint64; - void *ptr; + void __user *ptr; } divert_cf_arg; @@ -111,7 +111,7 @@ struct divert_cf #ifdef CONFIG_NET_DIVERT int alloc_divert_blk(struct net_device *); void free_divert_blk(struct net_device *); -int divert_ioctl(unsigned int cmd, struct divert_cf *arg); +int divert_ioctl(unsigned int cmd, struct divert_cf __user *arg); void divert_frame(struct sk_buff *skb); static inline void handle_diverter(struct sk_buff *skb) { diff --git a/include/linux/if.h b/include/linux/if.h index a9fdca178d24..0a3fdd8cab13 100644 --- a/include/linux/if.h +++ b/include/linux/if.h @@ -144,7 +144,7 @@ struct ifreq struct ifmap ifru_map; char ifru_slave[IFNAMSIZ]; /* Just fits the size */ char ifru_newname[IFNAMSIZ]; - char * ifru_data; + char __user * ifru_data; struct if_settings ifru_settings; } ifr_ifru; }; diff --git a/include/linux/wireless.h b/include/linux/wireless.h index 965a83b1c31f..8022bf19a951 100644 --- a/include/linux/wireless.h +++ b/include/linux/wireless.h @@ -438,7 +438,7 @@ struct iw_param */ struct iw_point { - caddr_t pointer; /* Pointer to the data (in user space) */ + void __user *pointer; /* Pointer to the data (in user space) */ __u16 length; /* number of fields or size in bytes */ __u16 flags; /* Optional params */ }; |