From nobody Sun Jun 1 09:22:24 2025 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 4b9BMP4TzVz5xNyn; Sun, 01 Jun 2025 09:22:25 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9BMP0507z3c13; Sun, 01 Jun 2025 09:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769745; 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=3vrN3rGvd6CZqD2eaGzJcEw8FNiXwSpcGLtMbvPOq44=; b=XKgn/XD3JQQnEkD2o4uZKfWF7PkemyRGrcB7dIsd231SDVyFIfWsViFu2f8MgLYus4yJEO TbSzMxGYUt7I6dci3szY/4nxuA/S0h0UyNM2WFnPJE5FjCsppqhfz7pUUSTwqnzIsV2oNS 3aUkPby3ofcTuG0Sx4fMDH3rRHMhX+9NkuKwEaIUnM0jBBY7qFNAvhDceC1NnySrIg8hD/ Ql2pK7veyoW+31irBBn29LvevXqPI4ZWLaSsPZpxzVO6leSkkO/MSxQl2cLprWzVsLnXeV fPhsL7+Osz69b44TistnF467uwuH4IPwWVS3BxOtyB1aIE6jlLfgPnHxLfYEfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769745; 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=3vrN3rGvd6CZqD2eaGzJcEw8FNiXwSpcGLtMbvPOq44=; b=VVwNOi1p6wjczJmrp4qOqxnosjr7+6cRyRIm2z8kmyn3nioN9qPN05oqDI7m8ZD/DLYUr1 s8ixQLEOB2Y8przHgpIX9kNbwctwtI/MLpoAbkevgmhByCdH5+/z8ts6Xm59sxwTajMTTz lZ9LujPYIpMd8Q4OItEhxzyHR+TtCsUqa3w6n0gNFFMR/JbUIHCMcAdV09l5sLeothCAzx 4N/86q2fC6hE9oPHygzI9JRuywR/xiCCDNNrOwaOdzgL70baJI9iHHPUADHpjpNbIvib5k c59lUR5U4kh8ILM8ZtcXHBbskDsUfJ3uKS8SgbZOBN/I+y9ViVaQVNMl+INQoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748769745; a=rsa-sha256; cv=none; b=JsfhWyrdbX3+Vajb7VdlsZf+IV+rRPcLdqi7L4MJDzjHrg7sulHB6LmewNLK0KwMQUNiU6 RC718iyATgijpOutbljEZiGGYhOV/axWt65C5NeMeNh/gpeGiYEJfETszwQx/V1mbxqkb2 +5eHtcziOMy17dewjPti4K3aU3RdT+Hsf7zh6d7SKjveUMV/Jx/jqHiZI/l2bY7/HvpTJQ 6aOWIoB3tZhDm52S9ZBLewod3innKdFvnDDyFH7Et6TygqrjU5HIxd7jPoUsxozOCZKNYM 1DhN/vTdCZuoN7xw5BjF+e+Yxjm1jfN03HOlM8rK2Y7oxI0Rfnqy21nC5ZGAkg== 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 4b9BMN6jdkz32k; Sun, 01 Jun 2025 09:22:24 +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 5519MOxG049217; Sun, 1 Jun 2025 09:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5519MOtk049214; Sun, 1 Jun 2025 09:22:24 GMT (envelope-from git) Date: Sun, 1 Jun 2025 09:22:24 GMT Message-Id: <202506010922.5519MOtk049214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: cf624ffa812c - stable/14 - ifconfig: reject netmask and broadcast for inet6 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cf624ffa812c90f8bd4b37f42488db1e782be883 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=cf624ffa812c90f8bd4b37f42488db1e782be883 commit cf624ffa812c90f8bd4b37f42488db1e782be883 Author: Lexi Winter AuthorDate: 2025-05-21 03:59:59 +0000 Commit: Lexi Winter CommitDate: 2025-06-01 09:14:52 +0000 ifconfig: reject netmask and broadcast for inet6 We don't support setting netmask or broadcast address for INET6 addresses, and trying to do crashes ifconfig. Handle this the same way as af_link, by rejecting attempts to configure these parameters. PR: 286910 Reported by: Hayzam Sherif MFC after: 3 days Reviewed by: zlei, kevans, des, cy Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50413 (cherry picked from commit 59ee9260e6bbcc3b5654126eed6e9490315c81f1) ifconfig tests: remove incorrect #! Fixes: 59ee9260e6bb ("ifconfig: reject netmask and broadcast for inet6") Reviewed by: des Differential Revision: https://reviews.freebsd.org/D50566 (cherry picked from commit 6ab70fbec4236a940275a42e301f76ade7faacbf) --- sbin/ifconfig/af_inet6.c | 5 +++ sbin/ifconfig/tests/Makefile | 6 ++-- sbin/ifconfig/tests/inet6.sh | 83 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index fcd04139a8c1..17dc068ee875 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -428,6 +428,11 @@ in6_getaddr(const char *addr_str, int which) { struct in6_px *px = sin6tab_nl[which]; + if (which == MASK) + errx(1, "netmask: invalid option for inet6"); + if (which == BRDADDR) + errx(1, "broadcast: invalid option for inet6"); + px->set = true; px->plen = 128; if (which == ADDR) { diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile index 9b29983afc7c..e902f262552a 100644 --- a/sbin/ifconfig/tests/Makefile +++ b/sbin/ifconfig/tests/Makefile @@ -1,6 +1,8 @@ +NETBSD_ATF_TESTS_SH= nonexistent_test +ATF_TESTS_SH+= inet6 -NETBSD_ATF_TESTS_SH= nonexistent_test +TEST_METADATA+= execenv="jail" +TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets" .include - .include diff --git a/sbin/ifconfig/tests/inet6.sh b/sbin/ifconfig/tests/inet6.sh new file mode 100644 index 000000000000..edfd88d93af7 --- /dev/null +++ b/sbin/ifconfig/tests/inet6.sh @@ -0,0 +1,83 @@ +# SPDX-License-Identifier: ISC +# +# Copyright (c) 2025 Lexi Winter + +. $(atf_get_srcdir)/../../sys/common/vnet.subr + +# Bug 286910: adding 'netmask' or 'broadcast' to an IPv6 address crashed +# ifconfig. + +atf_test_case "netmask" "cleanup" +netmask_head() +{ + atf_set descr "Test invalid 'netmask' option" + atf_set require.user root +} + +netmask_body() +{ + vnet_init + + ep=$(vnet_mkepair) + vnet_mkjail ifcjail ${ep}a + + # Add the address the wrong way + atf_check -s exit:1 \ + -e match:"ifconfig: netmask: invalid option for inet6" \ + jexec ifcjail ifconfig ${ep}a inet6 2001:db8:1::1 netmask 64 + + # Add the address the correct way + atf_check -s exit:0 \ + jexec ifcjail ifconfig ${ep}a inet6 2001:db8:1::1/64 + atf_check -s exit:0 -o match:"2001:db8:1::1 prefixlen 64" \ + jexec ifcjail ifconfig ${ep}a + + # Remove the address the wrong way + atf_check -s exit:1 \ + -e match:"ifconfig: netmask: invalid option for inet6" \ + jexec ifcjail ifconfig ${ep}a inet6 2001:db8:1::1 netmask 64 -alias +} + +netmask_cleanup() +{ + vnet_cleanup +} + +atf_test_case "broadcast" "cleanup" +broadcast_head() +{ + atf_set descr "Test invalid 'broadcast' option" + atf_set require.user root +} + +broadcast_body() +{ + vnet_init + + ep=$(vnet_mkepair) + vnet_mkjail ifcjail ${ep}a + + atf_check -s exit:1 \ + -e match:"ifconfig: broadcast: invalid option for inet6" \ + jexec ifcjail ifconfig ${ep}a \ + inet6 2001:db8:1::1 broadcast 2001:db8:1::ffff + + atf_check -s exit:0 \ + jexec ifcjail ifconfig ${ep}a inet6 2001:db8:1::1/64 + + atf_check -s exit:1 \ + -e match:"ifconfig: broadcast: invalid option for inet6" \ + jexec ifcjail ifconfig ${ep}a \ + inet6 2001:db8:1::1 broadcast 2001:db:1::ffff -alias +} + +broadcast_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case netmask + atf_add_test_case broadcast +}