git: 93e96359c980 - main - libpfctl: ensure we return useful error codes

[Kristof Provost]

The branch main has been updated by kp:

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

commit 93e96359c980ccf318fe089b30b863f7c910b622
Author:     Kristof Provost <k...@freebsd.org>
AuthorDate: 2024-09-20 09:36:22 +0000
Commit:     Kristof Provost <k...@freebsd.org>
CommitDate: 2024-09-21 22:55:46 +0000

    libpfctl: ensure we return useful error codes
    
    Return errno rather than -1 on error. This allows pfctl to report much
    more useful errors.
    
    Reported by:    Alexander Leidinger <alexan...@leidinger.net>
    MFC after:      1 week
---
 lib/libpfctl/libpfctl.c | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c
index 11984a301336..c8eeb913e912 100644
--- a/lib/libpfctl/libpfctl.c
+++ b/lib/libpfctl/libpfctl.c
@@ -2164,8 +2164,12 @@ pfctl_clear_rules(int dev, const char *anchorname)
 
        ret = ioctl(dev, DIOCXBEGIN, &trans);
        if (ret != 0)
-               return (ret);
-       return ioctl(dev, DIOCXCOMMIT, &trans);
+               return (errno);
+       ret = ioctl(dev, DIOCXCOMMIT, &trans);
+       if (ret != 0)
+               return (errno);
+
+       return (0);
 }
 
 int
@@ -2199,9 +2203,14 @@ pfctl_clear_nat(int dev, const char *anchorname)
 
        ret = ioctl(dev, DIOCXBEGIN, &trans);
        if (ret != 0)
-               return (ret);
-       return ioctl(dev, DIOCXCOMMIT, &trans);
+               return (errno);
+       ret = ioctl(dev, DIOCXCOMMIT, &trans);
+       if (ret != 0)
+               return (errno);
+
+       return (0);
 }
+
 int
 pfctl_clear_eth_rules(int dev, const char *anchorname)
 {
@@ -2223,8 +2232,12 @@ pfctl_clear_eth_rules(int dev, const char *anchorname)
 
        ret = ioctl(dev, DIOCXBEGIN, &trans);
        if (ret != 0)
-               return (ret);
-       return ioctl(dev, DIOCXCOMMIT, &trans);
+               return (errno);
+       ret = ioctl(dev, DIOCXCOMMIT, &trans);
+       if (ret != 0)
+               return (errno);
+
+       return (0);
 }
 
 static int
@@ -2278,7 +2291,10 @@ pfctl_set_syncookies(int dev, const struct 
pfctl_syncookies *s)
        ret = ioctl(dev, DIOCSETSYNCOOKIES, &nv);
 
        free(nv.data);
-       return (ret);
+       if (ret != 0)
+               return (errno);
+
+       return (0);
 }
 
 int
@@ -2386,7 +2402,7 @@ pfctl_table_set_addrs(int dev, struct pfr_table *tbl, 
struct pfr_addr
        io.pfrio_size = size;
        io.pfrio_size2 = (size2 != NULL) ? *size2 : 0;
        if (ioctl(dev, DIOCRSETADDRS, &io))
-               return (-1);
+               return (errno);
        if (nadd != NULL)
                *nadd = io.pfrio_nadd;
        if (ndel != NULL)
@@ -2414,7 +2430,7 @@ int pfctl_table_get_addrs(int dev, struct pfr_table *tbl, 
struct pfr_addr *addr,
        io.pfrio_esize = sizeof(*addr);
        io.pfrio_size = *size;
        if (ioctl(dev, DIOCRGETADDRS, &io))
-               return (-1);
+               return (errno);
        *size = io.pfrio_size;
        return (0);
 }