Patch "sctp: do not allow the v4 socket to bind a v4mapped v6 address" has been added to the 3.18-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
sctp: do not allow the v4 socket to bind a v4mapped v6 address
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sctp-do-not-allow-the-v4-socket-to-bind-a-v4mapped-v6-address.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Jan 29 11:15:06 CET 2018
From: Xin Long <[email protected]>
Date: Mon, 15 Jan 2018 17:02:00 +0800
Subject: sctp: do not allow the v4 socket to bind a v4mapped v6 address
From: Xin Long <[email protected]>
[ Upstream commit c5006b8aa74599ce19104b31d322d2ea9ff887cc ]
The check in sctp_sockaddr_af is not robust enough to forbid binding a v4mapped v6 addr on a v4 socket.
The worse thing is that v4 socket's bind_verify would not convert this v4mapped v6 addr to a v4 addr. syzbot even reported a crash as the v4 socket bound a v6 addr.
This patch is to fix it by doing the common sa.sa_family check first, then AF_INET check for v4mapped v6 addrs.
--- net/sctp/socket.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
net/sctp/socket.c +6 -8
@@ -333,16 +333,14 @@ static struct sctp_af *sctp_sockaddr_af(if (len <sizeof (struct sockaddr ))return NULL ; +if (!opt->pf->af_supported (addr->sa.sa_family, opt)) +return NULL ; +/* V4 mapped address are really of AF_INET family */ if (addr->sa.sa_family ==AF_INET6 && -ipv6_addr_v4mapped (&addr->v6.sin6_addr)) { -if (!opt->pf->af_supported (AF_INET , opt)) -return NULL ; - }else { -/* Does this PF support this AF? */ -if (!opt->pf->af_supported (addr->sa.sa_family, opt)) -return NULL ; - } +ipv6_addr_v4mapped (&addr->v6.sin6_addr) && + !opt->pf->af_supported (AF_INET , opt)) +return NULL ;/* If we get this far, af is valid. */ af =sctp_get_af_specific (addr->sa.sa_family);
Patches currently in stable-queue which might be from [email protected] are
queue-3.18/sctp-do-not-allow-the-v4-socket-to-bind-a-v4mapped-v6-address.patch queue-3.18/pppoe-take-needed_headroom-of-lower-device-into-account-on-xmit.patch queue-3.18/sctp-return-error-if-the-asoc-has-been-peeled-off-in-sctp_wait_for_sndbuf.patch