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/ax25/af_ax25.c | |
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/ax25/af_ax25.c')
-rw-r--r-- | net/ax25/af_ax25.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 7bb1605bdfd9..c35c3f48fc0f 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c | |||
@@ -1435,7 +1435,7 @@ out: | |||
1435 | static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock, | 1435 | static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock, |
1436 | struct msghdr *msg, size_t len) | 1436 | struct msghdr *msg, size_t len) |
1437 | { | 1437 | { |
1438 | struct sockaddr_ax25 *usax = (struct sockaddr_ax25 *)msg->msg_name; | 1438 | DECLARE_SOCKADDR(struct sockaddr_ax25 *, usax, msg->msg_name); |
1439 | struct sock *sk = sock->sk; | 1439 | struct sock *sk = sock->sk; |
1440 | struct sockaddr_ax25 sax; | 1440 | struct sockaddr_ax25 sax; |
1441 | struct sk_buff *skb; | 1441 | struct sk_buff *skb; |
@@ -1640,7 +1640,7 @@ static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1640 | ax25_digi digi; | 1640 | ax25_digi digi; |
1641 | ax25_address src; | 1641 | ax25_address src; |
1642 | const unsigned char *mac = skb_mac_header(skb); | 1642 | const unsigned char *mac = skb_mac_header(skb); |
1643 | struct sockaddr_ax25 *sax = msg->msg_name; | 1643 | DECLARE_SOCKADDR(struct sockaddr_ax25 *, sax, msg->msg_name); |
1644 | 1644 | ||
1645 | memset(sax, 0, sizeof(struct full_sockaddr_ax25)); | 1645 | memset(sax, 0, sizeof(struct full_sockaddr_ax25)); |
1646 | ax25_addr_parse(mac + 1, skb->data - mac - 1, &src, NULL, | 1646 | ax25_addr_parse(mac + 1, skb->data - mac - 1, &src, NULL, |