From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226PsC7+dgVKfg3daV25/EBMvyJGJV/ycVwnr9yATozPbjFpuX8s/xXgpfyVcKvAz5qpGOuA ARC-Seal: i=1; a=rsa-sha256; t=1517256520; cv=none; d=google.com; s=arc-20160816; b=GrMcWEBDgWzr13E9iZXC6QuEoum0khDaH6qm0M4Q3/Ie277DlROZ/7WkXITeJ09v7O FpMCLsipL6bZG+x0rm8z5FAvE+EicVb5Y9jT4wmNzOiasY0H0T0M+a2DzoE+CmM8Dx6t a1upzyN13bunwZRUNXLUkvZTIpztuPrTQx8hfDZR1kdnTgLw0hZ+1VtnZLs3GGXFgLGj wDnbJvvm1k14CkkAaYpcC33SC8KhtzII/NJ9fcSanweYQzRfl/R3b0AAwTexUtoMm+lR LLiT9emSgzeWYffZDqsY80BiCE+a1vLxXMy+755a0Sv/X6hLYcXNz8joWuTf8tjWRIRO bVHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=oZCM+efokSSPYP9d513AhcBQ0w5d9CPpkYTyvoAZkJ0=; b=OvM7jgqfy8Y0K/jVC+x1YNIpBFFGrrFuxRdn/lYk0SgHo91yI/gEumqx1QMNXNh2Xl Pns1OuLgsgIs6tHynbwr3Nt7jOTdB4Qr1t9bUyAoXP3jz9QxZlwqmCUAD1UwS504FmbV tAA+Oi83wb0zY/Dptp1fbc1DpxbJ88I6S2ekclRj/M+4obKwtu3XKtHXQoSyI733LsPQ 6/7UaCX4JPIvG6WyXfUBlpsdxWS/QLIXdz0sm8CXe9LZCynIcClXAZ87FMvsVKLo06Bt IH4hCJ+CVqO/pr3TbafVfUz3er//HSyCk8RnEHnuvTJzH/U8WjpRbBSbV3CeZbKgJ2+M qT+Q== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+7b7b518b1228d2743963@syzkaller.appspotmail.com, Neil Horman , Xin Long , Marcelo Ricardo Leitner , "David S. Miller" Subject: [PATCH 3.18 47/52] sctp: do not allow the v4 socket to bind a v4mapped v6 address Date: Mon, 29 Jan 2018 13:57:05 +0100 Message-Id: <20180129123630.227935700@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123628.168904217@linuxfoundation.org> References: <20180129123628.168904217@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958773280293896?= X-GMAIL-MSGID: =?utf-8?q?1590958773280293896?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xin Long [ 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. Fixes: 7dab83de50c7 ("sctp: Support ipv6only AF_INET6 sockets.") Reported-by: syzbot+7b7b518b1228d2743963@syzkaller.appspotmail.com Acked-by: Neil Horman Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sctp/socket.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -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);