From nobody Sat Oct 07 14:04:04 2023 X-Original-To: dev-commits-src-main@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 4S2n8j0c42z4wTNy; Sat, 7 Oct 2023 14:04:05 +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 4S2n8j04wDz4Xjl; Sat, 7 Oct 2023 14:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696687445; 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=2FHIeaXaArm42Dfyn+lXL+uLAQcNG6nuHqmyfM43iz4=; b=HZvlHDovBJSZw2PODALqGAbT75Qeljpj2bc2ABWmcz5ObSrwZZva5r4SuwdIQJQaLbXeP9 qwOUBXGfyV17EziZ1nZWY+VjHkILNzHvOYeDmBblyqXN9XqIxLowBt/S4jeSSwwGc3VC8O EjLZQykmY2hvMq/CAU8vFTIv2HZVe34nPDGzjbFLD4wPRU9IaCehkUa/hoPPBx7Yyt1kax E+gkljujUbG97oC3/25CBEO1Piuf8Lm6VR1pe6+Tbpb4OESkuWOyRQvXqwXXaSlVBzEe6y HxU+3QC6jrA3sULqz4X/j8vJWcjXi11e7S5pI6/mbUrQj99I9RAUCgFnlhgyZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696687445; a=rsa-sha256; cv=none; b=tn9VLyJyBcuGK9/rD6SUeIKLrYfPaYHhgsW5JjGCsPSb9XhqWThCqGV7aJZLVBJsCD/Jl9 9AC2UQllPTtspomdwCkak0d7HwO9Hlk39pTp0JVZNp7J7GOfcPxgw5DvrLH7PfPsAyEdNq YnK+sj/WcpPrXZ5tjCc2tNiLXp5VyRudb1KVsIQEcJvcLxWhX1+Nq2MORqu2O58mIIYfWF WxHXXC4QXOqQlWsOILAPFDD/9zmuPBMOcgS0Y0upCcNzN/OwSZ0Uayt48Ukhm8uxkXTWCC T7axRF9WjBJYdKGFy9T+ghfZMOmzsX6WjeBG2k25t4q09Sopp5uphAq6QvDRgA== 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=1696687445; 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=2FHIeaXaArm42Dfyn+lXL+uLAQcNG6nuHqmyfM43iz4=; b=Bz47OSCqLrbN2Tdn9RZ6vcAPcw0wUNIIisYbxbxpada4YhgS188Kc654Zm/aM0XBrsbVEt ZblXjhjkObLKN1isaanYuLRnZ2y+3ZvCbkL6NGmTp/UM7B6gsF9gqelhfFllZpfwYkALmR K6+OC/haXkXAB5K/3zaRMQqbsqKMPKgACeD3rWDQwjHU5fAyyslngWWEwI26L+8o8Rra+H 9c2lX3F2bKn3amHm/ArKYQGzSkt26hZlXcRdSzEQ7ap2E0Szx35mdjAgGChoC5CyopF8pP jKHDMBAWohzk0gFMFTcAPgPfCh4CQZeMVHP1neA4yiG0wcOPz3P3vvdu0cS3+w== 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 4S2n8h6G5KzYvt; Sat, 7 Oct 2023 14:04:04 +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 397E44iQ053563; Sat, 7 Oct 2023 14:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 397E449k053560; Sat, 7 Oct 2023 14:04:04 GMT (envelope-from git) Date: Sat, 7 Oct 2023 14:04:04 GMT Message-Id: <202310071404.397E449k053560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: abca3ae7734f - main - udp: fix sending of IPv4-mapped addresses List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: abca3ae7734f664ee9c5edc7a9d3a17e29180bdb Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=abca3ae7734f664ee9c5edc7a9d3a17e29180bdb commit abca3ae7734f664ee9c5edc7a9d3a17e29180bdb Author: Michael Tuexen AuthorDate: 2023-10-07 13:56:00 +0000 Commit: Michael Tuexen CommitDate: 2023-10-07 13:56:00 +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 Reported by: syzbot+81ccc423a2737ed031ac@syzkaller.appspotmail.com Reported by: syzbot+c8e3dac881bba85bc029@syzkaller.appspotmail.com Reviewed by: markj, rrs, rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D42031 --- 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;