aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipx
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/ipx
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/ipx')
-rw-r--r--net/ipx/af_ipx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index e096025b477f..994e28bfb32e 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -1707,7 +1707,7 @@ static int ipx_sendmsg(struct kiocb *iocb, struct socket *sock,
1707{ 1707{
1708 struct sock *sk = sock->sk; 1708 struct sock *sk = sock->sk;
1709 struct ipx_sock *ipxs = ipx_sk(sk); 1709 struct ipx_sock *ipxs = ipx_sk(sk);
1710 struct sockaddr_ipx *usipx = (struct sockaddr_ipx *)msg->msg_name; 1710 DECLARE_SOCKADDR(struct sockaddr_ipx *, usipx, msg->msg_name);
1711 struct sockaddr_ipx local_sipx; 1711 struct sockaddr_ipx local_sipx;
1712 int rc = -EINVAL; 1712 int rc = -EINVAL;
1713 int flags = msg->msg_flags; 1713 int flags = msg->msg_flags;
@@ -1774,7 +1774,7 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock,
1774{ 1774{
1775 struct sock *sk = sock->sk; 1775 struct sock *sk = sock->sk;
1776 struct ipx_sock *ipxs = ipx_sk(sk); 1776 struct ipx_sock *ipxs = ipx_sk(sk);
1777 struct sockaddr_ipx *sipx = (struct sockaddr_ipx *)msg->msg_name; 1777 DECLARE_SOCKADDR(struct sockaddr_ipx *, sipx, msg->msg_name);
1778 struct ipxhdr *ipx = NULL; 1778 struct ipxhdr *ipx = NULL;
1779 struct sk_buff *skb; 1779 struct sk_buff *skb;
1780 int copied, rc; 1780 int copied, rc;