diff options
author | Steffen Hurrle <steffen@hurrle.net> | 2014-01-17 16:53:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-19 02:04:16 -0500 |
commit | 342dfc306fb32155314dad277f3c3686b83fb9f1 (patch) | |
tree | a0d220f9310725c72bac70945261c9282e7cf305 /net/decnet | |
parent | ea02f9411d9faa3553ed09ce0ec9f00ceae9885e (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/decnet')
-rw-r--r-- | net/decnet/af_decnet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index dd4d506ef923..2954dcbca832 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
@@ -1808,6 +1808,7 @@ out: | |||
1808 | rv = (flags & MSG_PEEK) ? -sk->sk_err : sock_error(sk); | 1808 | rv = (flags & MSG_PEEK) ? -sk->sk_err : sock_error(sk); |
1809 | 1809 | ||
1810 | if ((rv >= 0) && msg->msg_name) { | 1810 | if ((rv >= 0) && msg->msg_name) { |
1811 | __sockaddr_check_size(sizeof(struct sockaddr_dn)); | ||
1811 | memcpy(msg->msg_name, &scp->peer, sizeof(struct sockaddr_dn)); | 1812 | memcpy(msg->msg_name, &scp->peer, sizeof(struct sockaddr_dn)); |
1812 | msg->msg_namelen = sizeof(struct sockaddr_dn); | 1813 | msg->msg_namelen = sizeof(struct sockaddr_dn); |
1813 | } | 1814 | } |
@@ -1914,7 +1915,7 @@ static int dn_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
1914 | int err = 0; | 1915 | int err = 0; |
1915 | size_t sent = 0; | 1916 | size_t sent = 0; |
1916 | int addr_len = msg->msg_namelen; | 1917 | int addr_len = msg->msg_namelen; |
1917 | struct sockaddr_dn *addr = (struct sockaddr_dn *)msg->msg_name; | 1918 | DECLARE_SOCKADDR(struct sockaddr_dn *, addr, msg->msg_name); |
1918 | struct sk_buff *skb = NULL; | 1919 | struct sk_buff *skb = NULL; |
1919 | struct dn_skb_cb *cb; | 1920 | struct dn_skb_cb *cb; |
1920 | size_t len; | 1921 | size_t len; |