From nobody Tue Feb 22 22:32:09 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5478819DF136; Tue, 22 Feb 2022 22:32:10 +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 4K3DSB1Wbsz3HM0; Tue, 22 Feb 2022 22:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645569130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DSdb1jT5o6tW+xTAlRWl+LtCAOMZKx3V9DUbJzoGr0M=; b=QgWrGv5L9sE8OT5zd8YpODl2ZsUeGpt8l3yZAdvDYq0L2OmiB1ZlShBCzjZD1a7x1/0B3x crZCT4pSflJKw77+ZeSpiAK6gEVI8TnRcSp8zrobsYbWIw+f9lha33LWRAwJzOYCy3vExW A1d6tbkQHDBRWrOnogCYR+CAcmuPvbxl2h9HRWiRTiNRad1XbTPVxiubn4zttv4x54uwnl R1D7/HOoekspnuO7hAwOCQnjGMCEo5kEAGLTVSEtjfDR7ldZ1xrUkmWXgxz55W27J3Gnff 4OxmrQQ9nBemE4AHJiSCom9uBDGON8DkIzG5sagwMEdzutE8ZcW/4+Ndy5WXqw== 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 13B02495B; Tue, 22 Feb 2022 22:32:10 +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 21MMW9kV037312; Tue, 22 Feb 2022 22:32:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MMW9Gv037311; Tue, 22 Feb 2022 22:32:09 GMT (envelope-from git) Date: Tue, 22 Feb 2022 22:32:09 GMT Message-Id: <202202222232.21MMW9Gv037311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 1d0d786f95bf - stable/13 - sctp: improve handling of IPv4 addresses on IPV6 sockets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1d0d786f95bfb9ccccc465f8bce7cd39f2beb87d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645569130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DSdb1jT5o6tW+xTAlRWl+LtCAOMZKx3V9DUbJzoGr0M=; b=luyJBzghuXlgog+Ucwo3qlFaLb9yzRyRPfuhdvXq/W2/41gIJdzetlHvqnKTLlseeZF9rE 5PvoKviw7ccW0kMZtvwf1qxULQ6+LmK/v3Y0cl3ctSn6F67xwvd0kIZQ4XAJ4nNEqyDmvS 1L7Y68cG5yra6r1ZG8udQCvAnoRgROvZAKfFqsD1OrASoi8mY5z5iB4RRu8yihAk0gkJYf 0uVncFaRQQAzvhOSazrg5IP1nzbjNv/VgoRdopxVJEwmqiAioYsmOpsCj87RlNroc8BiKb T+nS9eIKrLMji4bB2fgv7mvU7XBVAqVu3zYc6dNkWHh5auDtC7sFmvPEJTpOQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645569130; a=rsa-sha256; cv=none; b=w94jeI2yD+eJd/XgHTnpe6DvUmYdHw3zf273dsexRmoBe2wO9BOpz1cH/NJH/QhoKLFfBk EWrYSKcMJvEdi/PbLXW+83JE+Q64LCVFhqWKQxhJJEt/MnqE1sd7XV/+SqbON4KbZNB4Bl iKw5Mxx6fWtZXDdNXcSQidyWOZow5av8GtFcyhDTasZSjtWPX1klAQhGYIb0K20BttM8kp j7riXdUUx+kSC/OY0wK/A9QazcbVIVlCr0RjC6P/I9BxuxZuExKt9j1HukFrlMGq7cyZBZ IJdeoJjnK+sQJ/xQYatDw3NEdv4iwHzSnvYyCHeI5xaIgfCrXZVDm0D7ED1ceQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1d0d786f95bfb9ccccc465f8bce7cd39f2beb87d commit 1d0d786f95bfb9ccccc465f8bce7cd39f2beb87d Author: Michael Tuexen AuthorDate: 2021-08-07 15:27:56 +0000 Commit: Michael Tuexen CommitDate: 2022-02-22 22:31:44 +0000 sctp: improve handling of IPv4 addresses on IPV6 sockets Reported by: syzbot+08fe66e4bfc2777cba95@syzkaller.appspotmail.com (cherry picked from commit 784692c74019fa69b5298fb1693a97f107c56b4b) --- sys/netinet6/sctp6_usrreq.c | 6 ++++-- 1 file 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;