From nobody Tue Apr 1 14:25:43 2025 X-Original-To: dev-commits-src-all@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 4ZRqzW2cXtz5rcDK; Tue, 01 Apr 2025 14:25:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZRqzW1ptmz3pbX; Tue, 01 Apr 2025 14:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743517543; 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=W9i1oohFGaqYaZ+QDBdbmSmhkCUcLfmcZpXY0aCOgdE=; b=r50sjTIB1hkqpNhQzZgDniZSeL5Gn9zxcpUBTe6/4MzE8uM0j8XuVzVCpuO94RY7pIFLlW PMgj0n9g+MBFVCOQo4NgUc/gOJs+m9q9OaTUe5AEm5oDeaWY/K5VmuDDk2ER8ADlufCNrt XT+L0sdes+ZurshNRDUH5iFVAVK/D9dIyPTYhnbK5JHTnpIOdnKd9w79ks84gFzpwsqmxx Rg8DFJTqnU0P/8M7QQJ+8pIdxBz9KZtIg00sqEyKAqVSDH165qWob1xOkTMwmBZBcQgl9X 5qmsEiMbZG5JVgSad665YGvR1Eh9YM/DkkX1esys3WLexT2hnz94G6mjXJkHVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743517543; a=rsa-sha256; cv=none; b=Z/+y4cEhnBKAglpQC3TZgaEuO6oeIL68bwGxGS/htltGSg+XVm9XWXOGyJMinXb54WcTxv LS+Is3QIn4tUxyYTqIg6GeDu6bwSlH2OcLJhugO25S35z+NozP2w+HLNKnxO0VAPU3pScJ 1Gbgd4YRy/iaMtBvlJR4fO1g/navtkxjQ/FF+HZCzoKrBNuSd1wW4kffebRlZSnCOCwIxU jQZaCGVNzxuH3ENcQ8992/EnzCeuRXmFWZo5YYxxQBORPsI4t3Wg5h+ahcMCm84TLHcZLW JM9jKCkeF33zlhXs2YOXuAZ744sMIKgbjoKtWwHxzydw5e8xHjNCet0tosuqqw== 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=1743517543; 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=W9i1oohFGaqYaZ+QDBdbmSmhkCUcLfmcZpXY0aCOgdE=; b=Kys+quHFaS+UHO13fv+/jE37c4tKPs9S2aw5UluaJeEbUETEoFejW3cK8qQvfy0hLEukzu lOMso8zY6kam3X4GhsTG/XNQzNmddwgJ1QuM7T1f4AMVTI35VY/5ndqcvIfbedTNUHrsCi 3puZmPbNrdj0fB2+TCriapmjeuxJgzN0LOXeH1y56LOarVZj+ipAHFlKGcGV8LSngeBrE8 pwUMrAXdmKa+NoVPut71Dh8vTqv0+843VDEH/2I91zfsyDagpopcd8CoUrpPZASY3qbPTT tMX4X/na/YqHH1S/SBjULn/Bt/tsgbeNVWWx8vMJo4QMWASt/sqZBxYTpm7KVg== 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 4ZRqzW1P4Czbd5; Tue, 01 Apr 2025 14:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 531EPhZi078871; Tue, 1 Apr 2025 14:25:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 531EPhu4078868; Tue, 1 Apr 2025 14:25:43 GMT (envelope-from git) Date: Tue, 1 Apr 2025 14:25:43 GMT Message-Id: <202504011425.531EPhu4078868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 04a7134c1e92 - main - if_ovpn: fix use-after-free of mbuf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04a7134c1e92c7752ffdc665f99ae26db70866c0 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=04a7134c1e92c7752ffdc665f99ae26db70866c0 commit 04a7134c1e92c7752ffdc665f99ae26db70866c0 Author: Kristof Provost AuthorDate: 2025-04-01 13:19:26 +0000 Commit: Kristof Provost CommitDate: 2025-04-01 14:15:29 +0000 if_ovpn: fix use-after-free of mbuf m_unshare() can return a new mbuf pointer. We update the 'm' pointer in ovpn_udp_input(), but if we decide to pass on the packet (e.g. because it's for an unknown peer) the caller (udp_append()) continues with the old 'm' pointer, eventually resulting in a use-after-free. Re-order operations in ovpn_udp_input() so that we don't modify the 'm' pointer until we're committed to keeping the packet. PR: 283426 Test case by: takahiro.kurosawa@gmail.com MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_ovpn.c | 12 +++--- tests/sys/net/if_ovpn/if_ovpn.sh | 81 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 6 deletions(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index cbcfe15dffc7..7bdbc565f4ca 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -2248,12 +2248,6 @@ ovpn_udp_input(struct mbuf *m, int off, struct inpcb *inp, M_ASSERTPKTHDR(m); - m = m_unshare(m, M_NOWAIT); - if (m == NULL) { - OVPN_COUNTER_ADD(sc, nomem_data_pkts_in, 1); - return (true); - } - OVPN_COUNTER_ADD(sc, transport_bytes_received, m->m_pkthdr.len - off); ohdrlen = sizeof(*ohdr) - sizeof(ohdr->auth_tag); @@ -2281,6 +2275,12 @@ ovpn_udp_input(struct mbuf *m, int off, struct inpcb *inp, return (false); } + m = m_unshare(m, M_NOWAIT); + if (m == NULL) { + OVPN_COUNTER_ADD(sc, nomem_data_pkts_in, 1); + return (true); + } + m = m_pullup(m, off + sizeof(*uhdr) + ohdrlen); if (m == NULL) { OVPN_RUNLOCK(sc); diff --git a/tests/sys/net/if_ovpn/if_ovpn.sh b/tests/sys/net/if_ovpn/if_ovpn.sh index ea1eed88de9e..2138e0f666ec 100644 --- a/tests/sys/net/if_ovpn/if_ovpn.sh +++ b/tests/sys/net/if_ovpn/if_ovpn.sh @@ -106,6 +106,86 @@ atf_test_case "4in4" "cleanup" ovpn_cleanup } +atf_test_case "bz283426" "cleanup" +bz283426_head() +{ + atf_set descr 'FreeBSD Bugzilla 283426' + atf_set require.user root + atf_set require.progs openvpn python3 +} + +bz283426_body() +{ + ovpn_init + + l=$(vnet_mkepair) + + vnet_mkjail a ${l}a + jexec a ifconfig ${l}a 192.0.2.1/24 up + vnet_mkjail b ${l}b + jexec b ifconfig ${l}b 192.0.2.2/24 up + + # Sanity check + atf_check -s exit:0 -o ignore jexec a ping -c 1 192.0.2.2 + + ovpn_start a " + dev ovpn0 + dev-type tun + proto udp4 + + cipher AES-256-GCM + auth SHA256 + + bind 0.0.0.0:1194 + server 198.51.100.0 255.255.255.0 + ca $(atf_get_srcdir)/ca.crt + cert $(atf_get_srcdir)/server.crt + key $(atf_get_srcdir)/server.key + dh $(atf_get_srcdir)/dh.pem + + mode server + script-security 2 + auth-user-pass-verify /usr/bin/true via-env + topology subnet + + keepalive 100 600 + " + ovpn_start b " + dev tun0 + dev-type tun + + client + + remote 192.0.2.1 + auth-user-pass $(atf_get_srcdir)/user.pass + + ca $(atf_get_srcdir)/ca.crt + cert $(atf_get_srcdir)/client.crt + key $(atf_get_srcdir)/client.key + dh $(atf_get_srcdir)/dh.pem + + keepalive 100 600 + " + + # Give the tunnel time to come up + sleep 10 + + atf_check -s exit:0 -o ignore jexec b ping -c 1 198.51.100.1 + + # Send a broadcast packet in the outer link. + echo "import socket as sk +s = sk.socket(sk.AF_INET, sk.SOCK_DGRAM) +s.setsockopt(sk.SOL_SOCKET, sk.SO_BROADCAST, 1) +s.sendto(b'x' * 1000, ('192.0.2.255', 1194))" | jexec b python3 + + atf_check -s exit:0 -o ignore jexec b ping -c 3 198.51.100.1 +} + +bz283426_cleanup() +{ + ovpn_cleanup +} + atf_test_case "4mapped" "cleanup" 4mapped_head() { @@ -1072,6 +1152,7 @@ destroy_unused_cleanup() atf_init_test_cases() { atf_add_test_case "4in4" + atf_add_test_case "bz283426" atf_add_test_case "4mapped" atf_add_test_case "6in4" atf_add_test_case "6in6"