From nobody Fri Oct 13 21:54:25 2023 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 4S6gJf1Jc9z4wqQr; Fri, 13 Oct 2023 21:54:26 +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 4S6gJf0n4Kz4lTd; Fri, 13 Oct 2023 21:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697234066; 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=OwPU1qBB2HEynLRUM2RHoJ137zkDqAW9tJYIdbgNTzw=; b=P/ZS0l3ao4ITAH1PAEZYCj52IqbneaPM5Uecfme4AanAUeL+cs4QQrFCXWLgp56q45RKkd uAr3hVt2ufemjNwU2tac4nBg53Cq5E2E+ZoVki6v+uuU2bZlaqnZiQXIZDYiaSvewiirEO WSeavmNLiq0ej5cC1gkxtxpXSJoHlMJ8p4hNMCceodD1LxBtMhBkBK8nbOLD7c1dF1YgX2 H7P7miD6rlH9boyG/AfXXF+dgi5DDlm6jIqA5h+bRK0MoQf/+nYN7uQXkHKglJ4EZLj4RE 8z62DDidU+m/BzC0sVs/tH+NR7RZdnhEn9GOjGC35CuBDa6JphofpqNZM0cJIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697234066; a=rsa-sha256; cv=none; b=cPxCw39INk0ivwTSPOGXCjyqOy9nsWVRUS/7DnfFNU8LgSSKMT4opQueeyCiKId79rqhUJ FL1b7MGUXTfij/okViun8qyDOEP46+3ILI1dKhNxRRDdRb3QSu1tpvwnqFHN3Drk37a6A3 IuMCXwoNvqtEz5fEKo/aUzmxDvDgKYMOt9n+Qu9x86sBDF4GVsX9ZSwYt0rrJr01cw4U9c 7jgo4yU14i6iWnzDaMw1AtTWeyYfx2oJIraT8qmg+/Fc5zErX+rTZJLw9AYbHH6nRXFM8C w0ahQlmaKkNL1/Qo/OaRTI/PKV0JLhNSSmoQYKZd05CtxXxWtlAMyYfFZql+EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697234066; 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=OwPU1qBB2HEynLRUM2RHoJ137zkDqAW9tJYIdbgNTzw=; b=OvvCb+SmQbzZZfZuLdzBmwZN/+63tGUy3eicFmz4sJjobm3IXJowzfJi6WX2Nx9twwte83 30eqiEGjXlUzHKq//qASuI2RLtn1f1XjPpJkamooWk2jSOE60OQsuGVA5/wcdselmtRzHU 1k+ZWVcnmIlwMywWV2PMrAomfeMSAMM6Pi9u/YwQpnYqfPXn/jY9G1YS35jcTDEXMR5L2D rWT5zU/5xjQE6CpQ/ZbTdi+RVZUYPqNURs3cMXAJt5HYXMZcWhGZ5zgNtpop7I3A18cFI/ Aq18596gtJLt3YPq+lnxraRqDOmMTuPMA7cA9+AQPO8dz9K+Uh20IZ/nRLJX1A== 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 4S6gJd6xVqz140b; Fri, 13 Oct 2023 21:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39DLsPUg030587; Fri, 13 Oct 2023 21:54:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DLsPp8030584; Fri, 13 Oct 2023 21:54:25 GMT (envelope-from git) Date: Fri, 13 Oct 2023 21:54:25 GMT Message-Id: <202310132154.39DLsPp8030584@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: f28965bcaa1f - releng/14.0 - udp: fix sending of IPv4-mapped addresses 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f28965bcaa1f7f1bd3d855f5c025daeb445d07a7 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f28965bcaa1f7f1bd3d855f5c025daeb445d07a7 commit f28965bcaa1f7f1bd3d855f5c025daeb445d07a7 Author: Michael Tuexen AuthorDate: 2023-10-07 13:56:00 +0000 Commit: Michael Tuexen CommitDate: 2023-10-13 21:29:47 +0000 udp: fix sending of IPv4-mapped addresses The inp_vflags field must be adjusted during the call of in_pcbbind_setup(). This is consistent with the other places in the code, but not elegant at all. PR: 274009 Approved by: re (gjb) Reported by: syzbot+81ccc423a2737ed031ac@syzkaller.appspotmail.com Reported by: syzbot+c8e3dac881bba85bc029@syzkaller.appspotmail.com Reviewed by: markj, rrs, rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D42031 (cherry picked from commit abca3ae7734f664ee9c5edc7a9d3a17e29180bdb) (cherry picked from commit 8209af15a6994d52276be05380e0c0b7ae117cea) --- sys/netinet/udp_usrreq.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 70d738bf2108..cbda7f536262 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1050,7 +1050,7 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, int cscov_partial = 0; int ipflags = 0; u_short fport, lport; - u_char tos; + u_char tos, vflagsav; uint8_t pr; uint16_t cscov = 0; uint32_t flowid = 0; @@ -1092,7 +1092,8 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, * pcb hash. */ if (sin == NULL || - (inp->inp_laddr.s_addr == INADDR_ANY && inp->inp_lport == 0)) + (inp->inp_laddr.s_addr == INADDR_ANY && inp->inp_lport == 0) || + (flags & PRUS_IPV6) != 0) INP_WLOCK(inp); else INP_RLOCK(inp); @@ -1203,10 +1204,17 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, error = EINVAL; goto release; } + if ((flags & PRUS_IPV6) != 0) { + vflagsav = inp->inp_vflag; + inp->inp_vflag |= INP_IPV4; + inp->inp_vflag &= ~INP_IPV6; + } INP_HASH_WLOCK(pcbinfo); error = in_pcbbind_setup(inp, &src, &laddr.s_addr, &lport, td->td_ucred); INP_HASH_WUNLOCK(pcbinfo); + if ((flags & PRUS_IPV6) != 0) + inp->inp_vflag = vflagsav; if (error) goto release; } @@ -1249,9 +1257,16 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, inp->inp_lport == 0 || sin->sin_addr.s_addr == INADDR_ANY || sin->sin_addr.s_addr == INADDR_BROADCAST) { + if ((flags & PRUS_IPV6) != 0) { + vflagsav = inp->inp_vflag; + inp->inp_vflag |= INP_IPV4; + inp->inp_vflag &= ~INP_IPV6; + } INP_HASH_WLOCK(pcbinfo); error = in_pcbconnect_setup(inp, sin, &laddr.s_addr, &lport, &faddr.s_addr, &fport, td->td_ucred); + if ((flags & PRUS_IPV6) != 0) + inp->inp_vflag = vflagsav; if (error) { INP_HASH_WUNLOCK(pcbinfo); goto release;