Bug fix for hw.machine and hw.machine_arch sysctl's.

For a NULL buffer sysctl needs to return just the length of the buffer.
seanbruno · Nov 26, 2014 · 8267ad2 · 8267ad2
1 parent cab0d36
commit 8267ad2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/bsd-user/freebsd/os-sys.c b/bsd-user/freebsd/os-sys.c
@@ -336,12 +336,16 @@ abi_long do_freebsd_sysctl(CPUArchState *env, abi_ulong namep, int32_t namelen,
     case CTL_HW:
         switch (snamep[1]) {
         case HW_MACHINE:
-            strlcpy(holdp, TARGET_HW_MACHINE, oldlen);
+	    holdlen = sizeof(TARGET_HW_MACHINE);
+	    if (holdp)
+		strlcpy(holdp, TARGET_HW_MACHINE, oldlen);
             ret = 0;
             goto out;
 
         case HW_MACHINE_ARCH:
-            strlcpy(holdp, TARGET_HW_MACHINE_ARCH, oldlen);
+	    holdlen = sizeof(TARGET_HW_MACHINE_ARCH);
+	    if (holdp)
+		strlcpy(holdp, TARGET_HW_MACHINE_ARCH, oldlen);
             ret = 0;
             goto out;