summaryrefslogtreecommitdiffstats
path: root/net/unix
diff options
context:
space:
mode:
authorSteffen Hurrle <steffen@hurrle.net>2014-01-17 16:53:15 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-19 02:04:16 -0500
commit342dfc306fb32155314dad277f3c3686b83fb9f1 (patch)
treea0d220f9310725c72bac70945261c9282e7cf305 /net/unix
parentea02f9411d9faa3553ed09ce0ec9f00ceae9885e (diff)
net: add build-time checks for msg->msg_name size
This is a follow-up patch to f3d3342602f8bc ("net: rework recvmsg handler msg_name and msg_namelen logic"). DECLARE_SOCKADDR validates that the structure we use for writing the name information to is not larger than the buffer which is reserved for msg->msg_name (which is 128 bytes). Also use DECLARE_SOCKADDR consistently in sendmsg code paths. Signed-off-by: Steffen Hurrle <steffen@hurrle.net> Suggested-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix')
-rw-r--r--net/unix/af_unix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 800ca61758ff..29fc8bee9702 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1450,7 +1450,7 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
1450 struct sock *sk = sock->sk; 1450 struct sock *sk = sock->sk;
1451 struct net *net = sock_net(sk); 1451 struct net *net = sock_net(sk);
1452 struct unix_sock *u = unix_sk(sk); 1452 struct unix_sock *u = unix_sk(sk);
1453 struct sockaddr_un *sunaddr = msg->msg_name; 1453 DECLARE_SOCKADDR(struct sockaddr_un *, sunaddr, msg->msg_name);
1454 struct sock *other = NULL; 1454 struct sock *other = NULL;
1455 int namelen = 0; /* fake GCC */ 1455 int namelen = 0; /* fake GCC */
1456 int err; 1456 int err;
@@ -1912,7 +1912,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
1912 struct scm_cookie tmp_scm; 1912 struct scm_cookie tmp_scm;
1913 struct sock *sk = sock->sk; 1913 struct sock *sk = sock->sk;
1914 struct unix_sock *u = unix_sk(sk); 1914 struct unix_sock *u = unix_sk(sk);
1915 struct sockaddr_un *sunaddr = msg->msg_name; 1915 DECLARE_SOCKADDR(struct sockaddr_un *, sunaddr, msg->msg_name);
1916 int copied = 0; 1916 int copied = 0;
1917 int check_creds = 0; 1917 int check_creds = 0;
1918 int target; 1918 int target;