diff options
| author | Maciej Żenczykowski <maze@google.com> | 2012-03-11 12:51:50 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-11 19:11:22 -0700 |
| commit | 43db362d3adda9e0a915ddb9a8d1a41186e19179 (patch) | |
| tree | 83f00b1c09a4f54c43f94da7afb3064923415394 /include | |
| parent | 8b2aaedee4eaa94e816144ed54b9707b96be29f8 (diff) | |
| download | linux-3.10-43db362d3adda9e0a915ddb9a8d1a41186e19179.tar.gz linux-3.10-43db362d3adda9e0a915ddb9a8d1a41186e19179.tar.bz2 linux-3.10-43db362d3adda9e0a915ddb9a8d1a41186e19179.zip | |
net: get rid of some pointless casts to sockaddr
The following 4 functions:
move_addr_to_kernel
move_addr_to_user
verify_iovec
verify_compat_iovec
are always effectively called with a sockaddr_storage.
Make this explicit by changing their signature.
This removes a large number of casts from sockaddr_storage to sockaddr.
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/socket.h | 4 | ||||
| -rw-r--r-- | include/net/compat.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index d0e77f607a7..da2d3e2543f 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -326,11 +326,11 @@ extern int csum_partial_copy_fromiovecend(unsigned char *kdata, int offset, unsigned int len, __wsum *csump); -extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode); +extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *address, int mode); extern int memcpy_toiovec(struct iovec *v, unsigned char *kdata, int len); extern int memcpy_toiovecend(const struct iovec *v, unsigned char *kdata, int offset, int len); -extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr *kaddr); +extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_storage *kaddr); extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data); struct timespec; diff --git a/include/net/compat.h b/include/net/compat.h index 9ee75edcc29..a974ae92d18 100644 --- a/include/net/compat.h +++ b/include/net/compat.h @@ -41,7 +41,7 @@ extern int compat_sock_get_timestampns(struct sock *, struct timespec __user *); #endif /* defined(CONFIG_COMPAT) */ extern int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *); -extern int verify_compat_iovec(struct msghdr *, struct iovec *, struct sockaddr *, int); +extern int verify_compat_iovec(struct msghdr *, struct iovec *, struct sockaddr_storage *, int); extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsigned); extern asmlinkage long compat_sys_sendmmsg(int, struct compat_mmsghdr __user *, unsigned, unsigned); |