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/vmw_vsock | |
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/vmw_vsock')
-rw-r--r-- | net/vmw_vsock/vmci_transport.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 687360da62d9..9bb63ffec4f2 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c | |||
@@ -1779,10 +1779,8 @@ static int vmci_transport_dgram_dequeue(struct kiocb *kiocb, | |||
1779 | goto out; | 1779 | goto out; |
1780 | 1780 | ||
1781 | if (msg->msg_name) { | 1781 | if (msg->msg_name) { |
1782 | struct sockaddr_vm *vm_addr; | ||
1783 | |||
1784 | /* Provide the address of the sender. */ | 1782 | /* Provide the address of the sender. */ |
1785 | vm_addr = (struct sockaddr_vm *)msg->msg_name; | 1783 | DECLARE_SOCKADDR(struct sockaddr_vm *, vm_addr, msg->msg_name); |
1786 | vsock_addr_init(vm_addr, dg->src.context, dg->src.resource); | 1784 | vsock_addr_init(vm_addr, dg->src.context, dg->src.resource); |
1787 | msg->msg_namelen = sizeof(*vm_addr); | 1785 | msg->msg_namelen = sizeof(*vm_addr); |
1788 | } | 1786 | } |