Skip to content

Commit d3d4d69

Browse files
lxingregkh
authored andcommitted
sctp: handle two v4 addrs comparison in sctp_inet6_cmp_addr
[ Upstream commit d625329 ] Since sctp ipv6 socket also supports v4 addrs, it's possible to compare two v4 addrs in pf v6 .cmp_addr, sctp_inet6_cmp_addr. However after Commit 1071ec9 ("sctp: do not check port in sctp_inet6_cmp_addr"), it no longer calls af1->cmp_addr, which in this case is sctp_v4_cmp_addr, but calls __sctp_v6_cmp_addr where it handles them as two v6 addrs. It would cause a out of bounds crash. syzbot found this crash when trying to bind two v4 addrs to a v6 socket. This patch fixes it by adding the process for two v4 addrs in sctp_inet6_cmp_addr. Fixes: 1071ec9 ("sctp: do not check port in sctp_inet6_cmp_addr") Reported-by: [email protected] Signed-off-by: Xin Long <[email protected]> Acked-by: Neil Horman <[email protected]> Acked-by: Marcelo Ricardo Leitner <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent f6c962d commit d3d4d69

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

net/sctp/ipv6.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,9 @@ static int sctp_inet6_cmp_addr(const union sctp_addr *addr1,
865865
if (sctp_is_any(sk, addr1) || sctp_is_any(sk, addr2))
866866
return 1;
867867

868+
if (addr1->sa.sa_family == AF_INET && addr2->sa.sa_family == AF_INET)
869+
return addr1->v4.sin_addr.s_addr == addr2->v4.sin_addr.s_addr;
870+
868871
return __sctp_v6_cmp_addr(addr1, addr2);
869872
}
870873

0 commit comments

Comments
 (0)