From owner-dev-commits-src-main@freebsd.org Sat Aug 7 12:57:27 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5068866B272;
Sat, 7 Aug 2021 12:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Ghj6v1TXlz3Pvs;
Sat, 7 Aug 2021 12:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 16847218B7;
Sat, 7 Aug 2021 12:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 177CvQTg042847;
Sat, 7 Aug 2021 12:57:26 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 177CvQZp042846;
Sat, 7 Aug 2021 12:57:26 GMT (envelope-from git)
Date: Sat, 7 Aug 2021 12:57:26 GMT
Message-Id: <202108071257.177CvQZp042846@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: b732091a761a - main - sctp: improve input validation of mapped
addresses in send() Reported
by: syzbot+35528f275f2eea6317cc@syzkaller.appspotmail.com Reported
by: syzbot+ac29916d5f16d241553d@syzkaller.appspotmail.com MFC after: 3 days
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: b732091a761a04c7a04229f28642d27dc48485d8
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Aug 2021 12:57:27 -0000
The branch main has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=b732091a761a04c7a04229f28642d27dc48485d8
commit b732091a761a04c7a04229f28642d27dc48485d8
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2021-08-07 12:50:40 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2021-08-07 12:50:40 +0000
sctp: improve input validation of mapped addresses in send()
Reported by: syzbot+35528f275f2eea6317cc@syzkaller.appspotmail.com
Reported by: syzbot+ac29916d5f16d241553d@syzkaller.appspotmail.com
MFC after: 3 days
---
sys/netinet/sctp_output.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index e34534e80fa3..5e9aff7bfba9 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -12434,9 +12434,13 @@ sctp_sosend(struct socket *so,
}
addr_to_use = addr;
#if defined(INET) && defined(INET6)
- if ((addr) && (addr->sa_family == AF_INET6)) {
+ if ((addr != NULL) && (addr->sa_family == AF_INET6)) {
struct sockaddr_in6 *sin6;
+ if (addr->sa_len != sizeof(struct sockaddr_in6)) {
+ SCTP_LTRACE_ERR_RET(NULL, NULL, NULL, SCTP_FROM_SCTP_OUTPUT, EINVAL);
+ return (EINVAL);
+ }
sin6 = (struct sockaddr_in6 *)addr;
if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
in6_sin6_2_sin(&sin, sin6);