From nobody Wed Jan 28 16:13:49 2026 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 4f1S4s4TMNz6QK2j for ; Wed, 28 Jan 2026 16:13:49 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f1S4s3vbkz3NJM for ; Wed, 28 Jan 2026 16:13:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769616829; 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=BJ6PBAHywTYCvc5shPc+52DKoaHKw0s8p7lN5IgOxvc=; b=u+pi3uez37Xp5bSPWMR+DSxLVleUE6o7HBcd/NYA4wH+I09gCsabCVJMidnnozxZXzHw4/ gFqB9lNIfKfRGZQ9Z9sEvAGmCrO9rWCwbDNAenXzUDZuOf9aA5RnEIOTxALKp4tL33QeHX tyjv9MfCtJUly34W6dN/KR/8zLVY3sj4qtX+BeRPd+Axe8iIIzLKR8cIkhxGDLSKanl5Gr 7Ql8nICbvIy1XPWfDpFAFvdZstju3tUFbJEdvD0L6zA3Ypj2fXnBMSDYghsa+YyY0gCm+9 hxL6ACzSO8BHFK1aiMlCsWSlGXT4/9Xy9eSnv+z+CUiZdAN1fZQKtHx0gElSYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769616829; 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=BJ6PBAHywTYCvc5shPc+52DKoaHKw0s8p7lN5IgOxvc=; b=WUOAqqbF12+Bs6KSGRleB84d8e0Q6U6RVHxni6RngR88gAtAeeppy0BRKWJIXecdCV8YJw UTYCGcRhmS7SNhwVH+RF1F9rwZelgQ7PJBrsEg9a86yggQmQSD0eNRaIgSNOj+ANARnnCQ do1FegIgAkSxtTXuXT0ySbxvblUtQsmQ18lc5tvQhvaroKuBupXxISYdJgK//ZJAGhjPwL wERDqJPQKmOO9SaCT/0kOimtrjK50WYPxwu1sXea2NzXpzNqStl5ReQ9cK0QJftigBnaZv mKAaI2V9c5KF5v3FhXb0rzTDGzcXxnppqRykUJ4JTCnF+bwba86DHQqJyPGv2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769616829; a=rsa-sha256; cv=none; b=IGgOCXTW1ojhUzyX9OMI9kiP79VC4VvLd5Z0QwxVJRkXuDiIsNIkryGZykrDUPnax6khNu EIv6kdS+pZi4G08PD4tPgCh1c7TjNgW48jnGzvx9loKFXAWDsAU3reMJeSZF7w8pBYU3e7 giSODtXm1PSSkHYHjqO8lI1zGaICyK8AxGdRFIWNpJ+eRJlKsu45hDNH4YVOjbkm5Ds0o5 1WuKjbrnyUR6ejJ+0WzZyvwcRkuXjPy3jtF4fPJuRe3IcYWNPfUziRPdhVRv8AS7QtTwTZ 5+h/daiflTPoGapOxkVFGLUUp/5qQFMd82A5uWSWAu1UPqsbQeM833lZ2Urv6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f1S4s3C7Fz10FK for ; Wed, 28 Jan 2026 16:13:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Jan 2026 16:13:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2ea85a622bcb - main - ifconfig: Exit with a non-zero status when SIOCSIFFIB fails 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ea85a622bcba92a7b58901d6a6e945df3022c4e Auto-Submitted: auto-generated Date: Wed, 28 Jan 2026 16:13:49 +0000 Message-Id: <697a35bd.379c9.60ea4bdd@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2ea85a622bcba92a7b58901d6a6e945df3022c4e commit 2ea85a622bcba92a7b58901d6a6e945df3022c4e Author: Mark Johnston AuthorDate: 2026-01-28 16:11:47 +0000 Commit: Mark Johnston CommitDate: 2026-01-28 16:11:47 +0000 ifconfig: Exit with a non-zero status when SIOCSIFFIB fails Previously, setting an interface FIB to some invalid value would result in a warning being printed, but the ifconfig command would exit with status 0, but this is wrong. Add a little regression test. Reviewed by: pouria, zlei, melifaro MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54918 --- sbin/ifconfig/iffib.c | 16 ++++++---------- sbin/ifconfig/tests/Makefile | 3 ++- sbin/ifconfig/tests/ifconfig.sh | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/sbin/ifconfig/iffib.c b/sbin/ifconfig/iffib.c index a99dd6885d08..c1f9b3defb40 100644 --- a/sbin/ifconfig/iffib.c +++ b/sbin/ifconfig/iffib.c @@ -69,14 +69,12 @@ setiffib(if_ctx *ctx, const char *val, int dummy __unused) char *ep; fib = strtoul(val, &ep, 0); - if (*ep != '\0' || fib > UINT_MAX) { - warn("fib %s not valid", val); - return; - } + if (*ep != '\0' || fib > UINT_MAX) + errx(1, "fib %s not valid", val); ifr.ifr_fib = fib; if (ioctl_ctx_ifr(ctx, SIOCSIFFIB, &ifr) < 0) - warn("ioctl (SIOCSIFFIB)"); + err(1, "ioctl (SIOCSIFFIB)"); } static void @@ -87,14 +85,12 @@ settunfib(if_ctx *ctx, const char *val, int dummy __unused) char *ep; fib = strtoul(val, &ep, 0); - if (*ep != '\0' || fib > UINT_MAX) { - warn("fib %s not valid", val); - return; - } + if (*ep != '\0' || fib > UINT_MAX) + errx(1, "fib %s not valid", val); ifr.ifr_fib = fib; if (ioctl_ctx_ifr(ctx, SIOCSTUNFIB, &ifr) < 0) - warn("ioctl (SIOCSTUNFIB)"); + err(1, "ioctl (SIOCSTUNFIB)"); } static struct cmd fib_cmds[] = { diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile index e902f262552a..8203c97cb013 100644 --- a/sbin/ifconfig/tests/Makefile +++ b/sbin/ifconfig/tests/Makefile @@ -1,5 +1,6 @@ NETBSD_ATF_TESTS_SH= nonexistent_test -ATF_TESTS_SH+= inet6 +ATF_TESTS_SH+= ifconfig \ + inet6 TEST_METADATA+= execenv="jail" TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets" diff --git a/sbin/ifconfig/tests/ifconfig.sh b/sbin/ifconfig/tests/ifconfig.sh new file mode 100644 index 000000000000..f95581ea97ba --- /dev/null +++ b/sbin/ifconfig/tests/ifconfig.sh @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2026 Stormshield + +. $(atf_get_srcdir)/../../sys/common/vnet.subr + +atf_test_case "badfib" "cleanup" +badfib_head() +{ + atf_set descr "Test adding an interface to a non-existent FIB" + atf_set require.user root +} +badfib_body() +{ + local epair + + vnet_init + + epair=$(vnet_mkepair) + atf_check -s exit:0 ifconfig ${epair}a fib 0 + atf_check -s not-exit:0 -e not-empty \ + ifconfig ${epair}a fib $(sysctl -n net.fibs) +} +badfib_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case badfib +}