git: afd74c400075 - main - cap_net: correct capability name from addr2name to name2addr

[Mariusz Zaborski]

The branch main has been updated by oshogbo:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=afd74c400075d94e01dd3430844bb290834660ef

commit afd74c400075d94e01dd3430844bb290834660ef
Author:     Mariusz Zaborski <osho...@freebsd.org>
AuthorDate: 2023-10-23 21:03:51 +0000
Commit:     Mariusz Zaborski <osho...@freebsd.org>
CommitDate: 2023-10-23 21:11:23 +0000

    cap_net: correct capability name from addr2name to name2addr
    
    Previously, while checking name2addr capabilities, we mistakenly used
    the addr2name set. This error could cause a process to inadvertently
    reset its limitations.
    
    Reported by:    Shawn Webb <shawn.w...@hardenedbsd.org>
---
 lib/libcasper/services/cap_net/cap_net.c        |  2 +-
 lib/libcasper/services/cap_net/tests/net_test.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/libcasper/services/cap_net/cap_net.c 
b/lib/libcasper/services/cap_net/cap_net.c
index bbb2a666440f..a8f039f81843 100644
--- a/lib/libcasper/services/cap_net/cap_net.c
+++ b/lib/libcasper/services/cap_net/cap_net.c
@@ -1232,7 +1232,7 @@ verify_name2addr_newlimits(const nvlist_t *oldlimits,
        oldfunclimits = NULL;
        if (oldlimits != NULL) {
                oldfunclimits = dnvlist_get_nvlist(oldlimits,
-                   LIMIT_NV_ADDR2NAME, NULL);
+                   LIMIT_NV_NAME2ADDR, NULL);
        }
 
        cookie = NULL;
diff --git a/lib/libcasper/services/cap_net/tests/net_test.c 
b/lib/libcasper/services/cap_net/tests/net_test.c
index 5522f92516eb..dcb897de467b 100644
--- a/lib/libcasper/services/cap_net/tests/net_test.c
+++ b/lib/libcasper/services/cap_net/tests/net_test.c
@@ -783,6 +783,18 @@ ATF_TC_BODY(capnet__limits_name2addr_hosts, tc)
        limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR);
        ATF_REQUIRE(cap_net_limit(limit) != 0);
 
+       /* Try to extend the limit. */
+       limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR);
+       ATF_REQUIRE(limit != NULL);
+       cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL);
+       ATF_REQUIRE(cap_net_limit(limit) != 0);
+
+       limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR);
+       ATF_REQUIRE(limit != NULL);
+       cap_net_limit_name2addr(limit, TEST_DOMAIN_0, NULL);
+       cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL);
+       ATF_REQUIRE(cap_net_limit(limit) != 0);
+
        cap_close(capnet);
 }