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/llc | |
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/llc')
-rw-r--r-- | net/llc/af_llc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index c71b699eb555..0080d2b0a8ae 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c | |||
@@ -707,7 +707,7 @@ out: | |||
707 | static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, | 707 | static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, |
708 | struct msghdr *msg, size_t len, int flags) | 708 | struct msghdr *msg, size_t len, int flags) |
709 | { | 709 | { |
710 | struct sockaddr_llc *uaddr = (struct sockaddr_llc *)msg->msg_name; | 710 | DECLARE_SOCKADDR(struct sockaddr_llc *, uaddr, msg->msg_name); |
711 | const int nonblock = flags & MSG_DONTWAIT; | 711 | const int nonblock = flags & MSG_DONTWAIT; |
712 | struct sk_buff *skb = NULL; | 712 | struct sk_buff *skb = NULL; |
713 | struct sock *sk = sock->sk; | 713 | struct sock *sk = sock->sk; |
@@ -884,7 +884,7 @@ static int llc_ui_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
884 | { | 884 | { |
885 | struct sock *sk = sock->sk; | 885 | struct sock *sk = sock->sk; |
886 | struct llc_sock *llc = llc_sk(sk); | 886 | struct llc_sock *llc = llc_sk(sk); |
887 | struct sockaddr_llc *addr = (struct sockaddr_llc *)msg->msg_name; | 887 | DECLARE_SOCKADDR(struct sockaddr_llc *, addr, msg->msg_name); |
888 | int flags = msg->msg_flags; | 888 | int flags = msg->msg_flags; |
889 | int noblock = flags & MSG_DONTWAIT; | 889 | int noblock = flags & MSG_DONTWAIT; |
890 | struct sk_buff *skb; | 890 | struct sk_buff *skb; |