Page MenuHomeFreeBSD
Files F109299895

D33964.diff
No OneTemporary
Actions

D33964.diff
View Options

Index: sys/compat/freebsd32/freebsd32.h
===================================================================
--- sys/compat/freebsd32/freebsd32.h
+++ sys/compat/freebsd32/freebsd32.h
@@ -432,19 +432,6 @@
uint32_t ksigtramp_spare[4];
};
-struct kinfo_vm_layout32 {
- uint32_t kvm_min_user_addr;
- uint32_t kvm_max_user_addr;
- uint32_t kvm_text_addr;
- uint32_t kvm_text_size;
- uint32_t kvm_data_addr;
- uint32_t kvm_data_size;
- uint32_t kvm_stack_addr;
- uint32_t kvm_stack_size;
- int kvm_map_flags;
- uint32_t kvm_spare[14];
-};
-
struct kld_file_stat_1_32 {
int version; /* set to sizeof(struct kld_file_stat_1) */
char name[MAXPATHLEN];
Index: sys/kern/kern_proc.c
===================================================================
--- sys/kern/kern_proc.c
+++ sys/kern/kern_proc.c
@@ -3215,14 +3215,6 @@
error = pget((pid_t)name[0], PGET_CANDEBUG, &p);
if (error != 0)
return (error);
-#ifdef COMPAT_FREEBSD32
- if (SV_CURPROC_FLAG(SV_ILP32)) {
- if (!SV_PROC_FLAG(p, SV_ILP32)) {
- PROC_UNLOCK(p);
- return (EINVAL);
- }
- }
-#endif
vmspace = vmspace_acquire_ref(p);
PROC_UNLOCK(p);
@@ -3246,30 +3238,7 @@
if ((vmspace->vm_map.flags & MAP_ASLR_STACK) != 0)
kvm.kvm_map_flags |= KMAP_FLAG_ASLR_STACK;
-#ifdef COMPAT_FREEBSD32
- if (SV_CURPROC_FLAG(SV_ILP32)) {
- struct kinfo_vm_layout32 kvm32;
-
- memset(&kvm32, 0, sizeof(kvm32));
- kvm32.kvm_min_user_addr = (uint32_t)kvm.kvm_min_user_addr;
- kvm32.kvm_max_user_addr = (uint32_t)kvm.kvm_max_user_addr;
- kvm32.kvm_text_addr = (uint32_t)kvm.kvm_text_addr;
- kvm32.kvm_text_size = (uint32_t)kvm.kvm_text_size;
- kvm32.kvm_data_addr = (uint32_t)kvm.kvm_data_addr;
- kvm32.kvm_data_size = (uint32_t)kvm.kvm_data_size;
- kvm32.kvm_stack_addr = (uint32_t)kvm.kvm_stack_addr;
- kvm32.kvm_stack_size = (uint32_t)kvm.kvm_stack_size;
- kvm32.kvm_map_flags = kvm.kvm_map_flags;
- vmspace_free(vmspace);
- error = SYSCTL_OUT(req, &kvm32, sizeof(kvm32));
- goto out;
- }
-#endif
-
error = SYSCTL_OUT(req, &kvm, sizeof(kvm));
-#ifdef COMPAT_FREEBSD32
-out:
-#endif
vmspace_free(vmspace);
return (error);
}
Index: sys/sys/user.h
===================================================================
--- sys/sys/user.h
+++ sys/sys/user.h
@@ -605,16 +605,16 @@
#define KMAP_FLAG_ASLR_STACK 0x10 /* the stack location is randomized */
struct kinfo_vm_layout {
- uintptr_t kvm_min_user_addr;
- uintptr_t kvm_max_user_addr;
- uintptr_t kvm_text_addr;
- size_t kvm_text_size;
- uintptr_t kvm_data_addr;
- size_t kvm_data_size;
- uintptr_t kvm_stack_addr;
- size_t kvm_stack_size;
- int kvm_map_flags;
- uintptr_t kvm_spare[14];
+ kvaddr_t kvm_min_user_addr;
+ kvaddr_t kvm_max_user_addr;
+ kvaddr_t kvm_text_addr;
+ ksize_t kvm_text_size;
+ kvaddr_t kvm_data_addr;
+ ksize_t kvm_data_size;
+ kvaddr_t kvm_stack_addr;
+ ksize_t kvm_stack_size;
+ uint64_t kvm_map_flags;
+ uint64_t kvm_spare[14];
};
#ifdef _KERNEL

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 4, 6:26 AM (10 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16449161
Default Alt Text
D33964.diff (2 KB)

Event Timeline