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/netrom | |
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/netrom')
-rw-r--r-- | net/netrom/af_netrom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 53c19a35fc6d..b74aa0755521 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c | |||
@@ -1028,7 +1028,7 @@ static int nr_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
1028 | { | 1028 | { |
1029 | struct sock *sk = sock->sk; | 1029 | struct sock *sk = sock->sk; |
1030 | struct nr_sock *nr = nr_sk(sk); | 1030 | struct nr_sock *nr = nr_sk(sk); |
1031 | struct sockaddr_ax25 *usax = (struct sockaddr_ax25 *)msg->msg_name; | 1031 | DECLARE_SOCKADDR(struct sockaddr_ax25 *, usax, msg->msg_name); |
1032 | int err; | 1032 | int err; |
1033 | struct sockaddr_ax25 sax; | 1033 | struct sockaddr_ax25 sax; |
1034 | struct sk_buff *skb; | 1034 | struct sk_buff *skb; |
@@ -1137,7 +1137,7 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1137 | struct msghdr *msg, size_t size, int flags) | 1137 | struct msghdr *msg, size_t size, int flags) |
1138 | { | 1138 | { |
1139 | struct sock *sk = sock->sk; | 1139 | struct sock *sk = sock->sk; |
1140 | struct sockaddr_ax25 *sax = (struct sockaddr_ax25 *)msg->msg_name; | 1140 | DECLARE_SOCKADDR(struct sockaddr_ax25 *, sax, msg->msg_name); |
1141 | size_t copied; | 1141 | size_t copied; |
1142 | struct sk_buff *skb; | 1142 | struct sk_buff *skb; |
1143 | int er; | 1143 | int er; |