sctp: fix copying more bytes than expected in sctp_add_bind_addr
Dmitry reported that sctp_add_bind_addr may read more bytes than expected in case the parameter is a IPv4 addr supplied by the user through calls such as sctp_bindx_add(), because it always copies sizeof(union sctp_addr) while the buffer may be just a struct sockaddr_in, which is smaller. This patch then fixes it by limiting the memcpy to the min between the union size and a (new parameter) provided addr size. Where possible this parameter still is the size of that union, except for reading from user-provided buffers, which then it accounts for protocol type. Reported-by: Dmitry Vyukov <dvyukov@google.com> Tested-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
e2857b8f11
commit
133800d1f0
@@ -216,6 +216,7 @@ int sctp_copy_local_addr_list(struct net *net, struct sctp_bind_addr *bp,
|
||||
(copy_flags & SCTP_ADDR6_ALLOWED) &&
|
||||
(copy_flags & SCTP_ADDR6_PEERSUPP)))) {
|
||||
error = sctp_add_bind_addr(bp, &addr->a,
|
||||
sizeof(addr->a),
|
||||
SCTP_ADDR_SRC, GFP_ATOMIC);
|
||||
if (error)
|
||||
goto end_copy;
|
||||
|
Reference in New Issue
Block a user