aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet6/sctp6_usrreq.c
diff options
context:
space:
mode:
authorMichael Tuexen <tuexen@FreeBSD.org>2021-08-07 15:27:56 +0000
committerMichael Tuexen <tuexen@FreeBSD.org>2021-08-07 15:27:56 +0000
commit784692c74019fa69b5298fb1693a97f107c56b4b (patch)
tree11b2c1f2b4764572df8e3c3f42dfdaa5209c2bb4 /sys/netinet6/sctp6_usrreq.c
parent112899c6afc5d174445b6ab4738b8eb4de19d835 (diff)
downloadsrc-784692c74019fa69b5298fb1693a97f107c56b4b.tar.gz
src-784692c74019fa69b5298fb1693a97f107c56b4b.zip
sctp: improve handling of IPv4 addresses on IPV6 sockets
Reported by: syzbot+08fe66e4bfc2777cba95@syzkaller.appspotmail.com MFC after: 3 days
Diffstat (limited to 'sys/netinet6/sctp6_usrreq.c')
-rw-r--r--sys/netinet6/sctp6_usrreq.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c
index 6f5d639e6367..fcbb566b53d3 100644
--- a/sys/netinet6/sctp6_usrreq.c
+++ b/sys/netinet6/sctp6_usrreq.c
@@ -771,7 +771,8 @@ sctp6_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
return (EINVAL);
}
}
- if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
+ if ((addr->sa_family == AF_INET6) &&
+ IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
struct sockaddr_in sin;
/* convert v4-mapped into v4 addr and send */
@@ -909,7 +910,8 @@ sctp6_connect(struct socket *so, struct sockaddr *addr, struct thread *p)
return (EINVAL);
}
}
- if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
+ if ((addr->sa_family == AF_INET6) &&
+ IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
/* convert v4-mapped into v4 addr */
in6_sin6_2_sin(&store.sin, sin6);
addr = &store.sa;