1 files changed, 59 insertions, 18 deletions

diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 7679aa1..a4c16bb 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -33,12 +33,15 @@
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <vm/dynalloc.h>
+#include <vm/vm.h>
 #include <string.h>
 
 #define HYRA_RELEASE "Hyra/" HYRA_ARCH " " \
         HYRA_VERSION " "              \
         HYRA_BUILDDATE
 
+static uint32_t pagesize = DEFAULT_PAGESIZE;
+static char machine[] = HYRA_ARCH;
 static char hyra[] = "Hyra";
 static char hyra_version[] = HYRA_VERSION;
 static char osrelease[] = HYRA_RELEASE;
@@ -49,10 +52,17 @@ static char osrelease[] = HYRA_RELEASE;
  *      allocated through dynalloc(9).
  */
 static struct sysctl_entry common_optab[] = {
+    /* 'kern.*' */
     [KERN_OSTYPE] = { KERN_OSTYPE, SYSCTL_OPTYPE_STR_RO, hyra },
     [KERN_OSRELEASE] = { KERN_OSRELEASE, SYSCTL_OPTYPE_STR_RO, &osrelease },
     [KERN_VERSION] = { KERN_VERSION, SYSCTL_OPTYPE_STR_RO, &hyra_version },
-    [KERN_VCACHE_TYPE] = { KERN_VCACHE_TYPE, SYSCTL_OPTYPE_STR, NULL }
+    [KERN_VCACHE_TYPE] = { KERN_VCACHE_TYPE, SYSCTL_OPTYPE_STR, NULL },
+    [KERN_HOSTNAME] = { KERN_HOSTNAME, SYSCTL_OPTYPE_STR, NULL },
+
+    /* 'hw.*' */
+    [HW_PAGESIZE] = { HW_PAGESIZE, SYSCTL_OPTYPE_INT_RO, &pagesize },
+    [HW_NCPU] = { HW_NCPU, SYSCTL_OPTYPE_INT, NULL },
+    [HW_MACHINE] = {HW_MACHINE, SYSCTL_OPTYPE_STR_RO, &machine }
 };
 
 static int
@@ -91,19 +101,18 @@ static int
 do_sysctl(struct sysctl_args *args)
 {
     struct sysctl_args new_args;
-    size_t name_len, oldlenp;
+    size_t name_len = 1, oldlenp = 0;
     int *name = NULL;
     void *oldp = NULL, *newp = NULL;
-    int retval = 0;
-
-    if (args->oldlenp == NULL) {
-        return -EINVAL;
-    }
-
-    name_len = args->nlen;
-    retval = copyin(args->oldlenp, &oldlenp, sizeof(oldlenp));
-    if (retval != 0) {
-        goto done;
+    int retval = 0, have_oldlen = 0;
+
+    if (args->oldlenp != NULL) {
+        have_oldlen = 1;
+        name_len = args->nlen;
+        retval = copyin(args->oldlenp, &oldlenp, sizeof(oldlenp));
+        if (retval != 0) {
+            goto done;
+        }
     }
 
     /* Copy in newp if it is set */
@@ -124,25 +133,30 @@ do_sysctl(struct sysctl_args *args)
         return retval;
     }
 
-    oldp = dynalloc(oldlenp);
-    retval = copyin(args->oldp, oldp, oldlenp);
-    if (retval != 0) {
-        return retval;
+    if (oldlenp != 0) {
+        oldp = dynalloc(oldlenp);
+        retval = copyin(args->oldp, oldp, oldlenp);
+        if (retval != 0) {
+            return retval;
+        }
     }
 
     /* Prepare the arguments for the sysctl call */
     new_args.name = name;
     new_args.nlen = name_len;
     new_args.oldp = oldp;
-    new_args.oldlenp = &oldlenp;
+    new_args.oldlenp = (have_oldlen) ? &oldlenp : NULL;
     new_args.newp = newp;
+    new_args.newlen = args->newlen;
 
     retval = sysctl(&new_args);
     if (retval != 0) {
         goto done;
     }
 
-    copyout(oldp, args->oldp, oldlenp);
+    if (oldlenp != 0) {
+        copyout(oldp, args->oldp, oldlenp);
+    }
 done:
     if (name != NULL)
         dynfree(name);
@@ -154,6 +168,33 @@ done:
     return retval;
 }
 
+/*
+ * Clear a writable sysctl string variable to the
+ * value of "(undef)"
+ *
+ * @name: Name to clear
+ */
+int
+sysctl_clearstr(int name)
+{
+    struct sysctl_args args;
+    char val[] = "(undef)";
+    int error;
+
+    args.name = &name;
+    args.nlen = 1;
+    args.oldlenp = 0;
+    args.oldp = NULL;
+    args.newp = val;
+    args.newlen = sizeof(val);
+
+    if ((error = sysctl(&args)) != 0) {
+        return error;
+    }
+
+    return 0;
+}
+
 int
 sysctl(struct sysctl_args *args)
 {