[src/trunk]: src/lib/libnpf Add method to initialize errinfo so that npfctl d...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4b9b053ebb47
branches:  trunk
changeset: 366680:4b9b053ebb47
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jun 07 16:27:24 2022 +0000

description:
Add method to initialize errinfo so that npfctl does not print random strings.

diffstat:

 lib/libnpf/npf.c |  22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diffs (57 lines):

diff -r 91763f6a7aae -r 4b9b053ebb47 lib/libnpf/npf.c
--- a/lib/libnpf/npf.c  Tue Jun 07 08:08:31 2022 +0000
+++ b/lib/libnpf/npf.c  Tue Jun 07 16:27:24 2022 +0000
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.49 2020/05/30 14:16:56 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.50 2022/06/07 16:27:24 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -206,6 +206,20 @@
 }
 
 /*
+ * _npf_init_error: initialize the error structure with the message
+ * from the current error number
+ */
+static int
+_npf_init_error(int error, npf_error_t *errinfo)
+{
+       if (error && errinfo) {
+               memset(errinfo, 0, sizeof(*errinfo));
+               errinfo->error_msg = strerror(error);
+       }
+       return error;
+}
+
+/*
  * _npf_extract_error: check the error number field and extract the
  * error details into the npf_error_t structure.
  */
@@ -346,7 +360,7 @@
 
        error = _npf_xfer_fd(fd, IOC_NPF_LOAD, ncf->ncf_dict, &resp);
        if (error) {
-               return error;
+               return _npf_init_error(errno, errinfo);
        }
        error = _npf_extract_error(resp, errinfo);
        nvlist_destroy(resp);
@@ -1258,12 +1272,12 @@
 
        /* Ensure const tables are built. */
        if ((error = _npf_table_build_const(tl)) != 0) {
-               return error;
+               return _npf_init_error(errno, errinfo);
        }
        error = _npf_xfer_fd(fd, IOC_NPF_TABLE_REPLACE, tl->table_dict, &resp);
        if (error) {
                assert(resp == NULL);
-               return errno;
+               return _npf_init_error(errno, errinfo);
        }
        error = _npf_extract_error(resp, errinfo);
        nvlist_destroy(resp);