aboutsummaryrefslogtreecommitdiffstats
path: root/net/l2tp/l2tp_ip.c
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/l2tp/l2tp_ip.c
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/l2tp/l2tp_ip.c')
-rw-r--r--net/l2tp/l2tp_ip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index da1a1cee1a08..0b44d855269c 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -403,7 +403,7 @@ static int l2tp_ip_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m
403 403
404 /* Get and verify the address. */ 404 /* Get and verify the address. */
405 if (msg->msg_name) { 405 if (msg->msg_name) {
406 struct sockaddr_l2tpip *lip = (struct sockaddr_l2tpip *) msg->msg_name; 406 DECLARE_SOCKADDR(struct sockaddr_l2tpip *, lip, msg->msg_name);
407 rc = -EINVAL; 407 rc = -EINVAL;
408 if (msg->msg_namelen < sizeof(*lip)) 408 if (msg->msg_namelen < sizeof(*lip))
409 goto out; 409 goto out;
@@ -512,7 +512,7 @@ static int l2tp_ip_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m
512 struct inet_sock *inet = inet_sk(sk); 512 struct inet_sock *inet = inet_sk(sk);
513 size_t copied = 0; 513 size_t copied = 0;
514 int err = -EOPNOTSUPP; 514 int err = -EOPNOTSUPP;
515 struct sockaddr_in *sin = (struct sockaddr_in *)msg->msg_name; 515 DECLARE_SOCKADDR(struct sockaddr_in *, sin, msg->msg_name);
516 struct sk_buff *skb; 516 struct sk_buff *skb;
517 517
518 if (flags & MSG_OOB) 518 if (flags & MSG_OOB)