blob: 0f2d96e5ee1d30cb35b721aa090addeb9878fdb8 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From nox Mon Sep 17 00:00:00 2001
From: Juergen Lock <nox@jelal.kn-bremen.de>
Date: 05 Apr 2014 23:36:00 +0200
Subject: Fix FreeBSD sysctls kern.usrstack and kern.ps_strings
Fix FreeBSD sysctls kern.usrstack and kern.ps_strings invoked with
oidlen zero. (like from sysctl(8))
Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>
--- a/bsd-user/freebsd/os-sys.c
+++ b/bsd-user/freebsd/os-sys.c
@@ -165,7 +165,9 @@ abi_long do_freebsd_sysctl(CPUArchState
switch (snamep[1]) {
case KERN_USRSTACK:
#if TARGET_USRSTACK != 0
- (*(abi_ulong *)holdp) = tswapal(TARGET_USRSTACK);
+ if (oldlen) {
+ (*(abi_ulong *)holdp) = tswapal(TARGET_USRSTACK);
+ }
holdlen = sizeof(abi_ulong);
ret = 0;
#else
@@ -175,7 +177,9 @@ abi_long do_freebsd_sysctl(CPUArchState
case KERN_PS_STRINGS:
#if defined(TARGET_PS_STRINGS)
- (*(abi_ulong *)holdp) = tswapal(TARGET_PS_STRINGS);
+ if (oldlen) {
+ (*(abi_ulong *)holdp) = tswapal(TARGET_PS_STRINGS);
+ }
holdlen = sizeof(abi_ulong);
ret = 0;
#else
|
