From nobody Wed May 13 16:46:02 2026 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 4gFzqZ4SCPz6cfRk for ; Wed, 13 May 2026 16:46:02 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFzqZ3xYQz3tjl for ; Wed, 13 May 2026 16:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690762; 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=cEGt6iOEedXRDife2WG883uzx77fIBiCY4NRk9b75Zk=; b=qvCeyYDQeNWsgfDJL7X4S4xiZccVGrTMWQQVnUYSiZE3IH7Vlb/TdOp8MOGUe2igOfm09q TD44Ye810uIdJh3HIAm2QW8FrOr3cwQrh0sQfmfD76Gec+a4pfVW57YG5Iq67PP9WdCjnR IhLfdOHhwCZP16IR8s6gi7mzX7YUAX5FFxxsr5yfxfXD8habMbuNIQp2xF1U7/EQ8bP+60 4oJ4lACZnNZf2cFKdAtXmCs3f21BDd+eIOtKSt6QR1y0te9fzb/oy3K2Ozfp9FKEGhsc+m TczIMlqxBeMbKPYS7U8JrbSLXiyQ9iJl5P3j6kAlVVXOOIyBBW/pntkQmiV7CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778690762; a=rsa-sha256; cv=none; b=yeGsgZCNr3ycL5Nkbizr/+4YRXm0kQl8pvuKwCdVEZeLTqEoSpllvQK6o46+tyMmM+abFN ZD28pGBQd/+HXHG/VyaxuvCAWtJqGVGSDy1qKGnalpJZwApUoqj5FmdQYB+TgYK+erARA0 UGSIzAZDPRWc2cQBK0cqzQyYgvRxxXQ7V25MYoa8DzOV/0gfyJxSK9F2LsOEXF7xcRUGjo 2KwAUXPJdiS4Lfrowgy+ydCyqm4M7ncrcLwBpQ3IMzvmdtUxGk1Fbna5lkjk7AHM/sSjzI R61Qku38cXQQidIl4f/RWPcuZAUSpcZUfgJHO+BwUAeF9I9BIDsPhELmMMrH4w== 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=1778690762; 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=cEGt6iOEedXRDife2WG883uzx77fIBiCY4NRk9b75Zk=; b=aceZ/ODH9qx7MUmtCeSteM33GPeE8dj4xlzMI7DSBD4/C9EjaUcKFHDJCdNncJl5N//y3x ox33UzmbmeE9x1paa8FlbphWt5sNt6e1wx3nCYjoMKd1Wgve8Y5Hi5m4GAztYNTp/XoHpN SWzUoh0G08V8mNcUOktb6ETAI01ZpSdkRZetpPwihesJzAdy19DhnSckVgJ7XsVr4eUrfQ eS1tIufWCqbt3I46ThElhz5FhjYHtpJRpSW5ZQmle5/6lCRv4N8LQvz1ILc0Kx+y96K6HS /HbilryVETwKUu8SS/9hi/RMiHIUGsLMBxpM0gcKmIwpON3sG4i/f2ZaVqXugw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFzqZ3DThzyqS for ; Wed, 13 May 2026 16:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dba7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 16:46:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: ee04ee95ab38 - main - cap_net: fix error propagation for ENOTCAPABLE in cap_getaddrinfo 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee04ee95ab386147c57d3b4efcc5774e8d64330b Auto-Submitted: auto-generated Date: Wed, 13 May 2026 16:46:02 +0000 Message-Id: <6a04aaca.3dba7.5cc94167@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=ee04ee95ab386147c57d3b4efcc5774e8d64330b commit ee04ee95ab386147c57d3b4efcc5774e8d64330b Author: Mariusz Zaborski AuthorDate: 2026-05-12 09:48:56 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-13 16:42:45 +0000 cap_net: fix error propagation for ENOTCAPABLE in cap_getaddrinfo Fixes: b60053fde172 ("libcasper: Fix inconsistent error codes of cap_get{addr,name}info()") --- lib/libcasper/services/cap_net/cap_net.c | 4 ++-- lib/libcasper/services/cap_net/tests/net_test.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c index 5887fe3c407e..59124e3cb54f 100644 --- a/lib/libcasper/services/cap_net/cap_net.c +++ b/lib/libcasper/services/cap_net/cap_net.c @@ -1011,12 +1011,12 @@ net_getaddrinfo(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout) } if (!net_allowed_family(funclimit, family)) { - errno = ENOTCAPABLE; + serrno = ENOTCAPABLE; error = EAI_SYSTEM; goto out; } if (!net_allowed_hosts(funclimit, hostname, servname)) { - errno = ENOTCAPABLE; + serrno = ENOTCAPABLE; error = EAI_SYSTEM; goto out; } diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c index adf5773233c8..21d620e0f8d8 100644 --- a/lib/libcasper/services/cap_net/tests/net_test.c +++ b/lib/libcasper/services/cap_net/tests/net_test.c @@ -73,7 +73,7 @@ test_getnameinfo_v4(cap_channel_t *chan, int family, const char *ip) capret = cap_getnameinfo(chan, (struct sockaddr *)&ipaddr, sizeof(ipaddr), capfn, sizeof(capfn), NULL, 0, NI_NAMEREQD); - if (capret != 0 && capret == ENOTCAPABLE) + if (capret == EAI_SYSTEM && errno == ENOTCAPABLE) return (ENOTCAPABLE); sysret = getnameinfo((struct sockaddr *)&ipaddr, sizeof(ipaddr), origfn, @@ -102,7 +102,7 @@ test_getnameinfo_v6(cap_channel_t *chan, const char *ip) capret = cap_getnameinfo(chan, (struct sockaddr *)&ipaddr, sizeof(ipaddr), capfn, sizeof(capfn), NULL, 0, NI_NAMEREQD); - if (capret != 0 && capret == ENOTCAPABLE) + if (capret == EAI_SYSTEM && errno == ENOTCAPABLE) return (ENOTCAPABLE); sysret = getnameinfo((struct sockaddr *)&ipaddr, sizeof(ipaddr), origfn, @@ -196,8 +196,8 @@ test_getaddrinfo(cap_channel_t *chan, int family, const char *domain, hints.ai_socktype = SOCK_STREAM; capret = cap_getaddrinfo(chan, domain, servname, &hints, &capres); - if (capret != 0 && capret == ENOTCAPABLE) - return (capret); + if (capret == EAI_SYSTEM && errno == ENOTCAPABLE) + return (ENOTCAPABLE); sysret = getaddrinfo(domain, servname, &hints, &origres); if (sysret != 0)