---

yaml --- r: 171075 b: refs/heads/master c: 38bfd8f h: refs/heads/master i: 171073: 2e3c733 171071: f4273b4 v: v3
git-mirror · Oct 29, 2009 · 82e8a93 · 82e8a93
1 parent 7c22ec3
commit 82e8a93
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed3f2e40f3d438f4a1ec0a898173116cb26f106a
+refs/heads/master: 38bfd8f5bec496e8e0db8849e01c99a33479418a
diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h
@@ -199,6 +199,9 @@ struct proto_ops {
 				       struct pipe_inode_info *pipe, size_t len, unsigned int flags);
 };
 
+#define DECLARE_SOCKADDR(type, dst, src)	\
+	type dst = ({ __sockaddr_check_size(sizeof(*dst)); (type) src; })
+
 struct net_proto_family {
 	int		family;
 	int		(*create)(struct net *net, struct socket *sock, int protocol);

diff --git a/trunk/include/linux/socket.h b/trunk/include/linux/socket.h
@@ -24,6 +24,9 @@ struct __kernel_sockaddr_storage {
 #include <linux/types.h>		/* pid_t			*/
 #include <linux/compiler.h>		/* __user			*/
 
+#define __sockaddr_check_size(size)	\
+	BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))
+
 #ifdef __KERNEL__
 # ifdef CONFIG_PROC_FS
 struct seq_file;

diff --git a/trunk/net/ipv4/af_inet.c b/trunk/net/ipv4/af_inet.c
@@ -685,7 +685,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr,
 {
 	struct sock *sk		= sock->sk;
 	struct inet_sock *inet	= inet_sk(sk);
-	struct sockaddr_in *sin	= (struct sockaddr_in *)uaddr;
+	DECLARE_SOCKADDR(struct sockaddr_in *, sin, uaddr);
 
 	sin->sin_family = AF_INET;
 	if (peer) {