Date: Wed, 24 Jun 2009 17:16:00 +0300 From: Andriy Gapon <avg@freebsd.org> To: Wesley Shields <wxs@freebsd.org>, Thomas Backman <serenity@exscape.org>, John Birrell <jb@freebsd.org> Cc: Alan Cox <alc@freebsd.org>, FreeBSD current <freebsd-current@freebsd.org> Subject: Re: DTrace panic while probing syscall::open (and possibly many others) Message-ID: <4A423520.3000101@freebsd.org> In-Reply-To: <4A42274E.2020207@freebsd.org> References: <60173AF0-7E54-4BDD-8927-0DADA9DAD1B4@exscape.org> <20090522200306.GE2630@atarininja.org> <20090617225849.GB28509@atarininja.org> <B2F32C8F-810B-4EA5-9E34-39ADD5E5CED4@exscape.org> <4A3A1D27.4010802@icyb.net.ua> <DD13EADF-CE41-465A-8D70-53DCDEFD65A7@exscape.org> <4A3BBF5A.6060702@icyb.net.ua> <4A3BC481.1010600@cs.rice.edu> <F72EDBE7-9A0A-44AB-AF58-23CE34CC93A0@exscape.org> <F55615D8-8AE3-41C6-BD2F-0DB911918465@exscape.org> <20090624003531.GA63536@atarininja.org> <4A42274E.2020207@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Please review and/or test the following patch.
I think that i386 dtrace code could also benefit from the similar changes and from
the fact that we now have stack.h for this arch too.
diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
index 8cd2a0f..c58e88e 100644
--- a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
@@ -42,8 +42,6 @@
#include <vm/vm_param.h>
#include <vm/pmap.h>
-extern uintptr_t kernbase;
-uintptr_t kernelbase = (uintptr_t) &kernbase;
uint8_t dtrace_fuword8_nocheck(void *);
uint16_t dtrace_fuword16_nocheck(void *);
@@ -524,9 +522,9 @@ dtrace_getreg(struct regs *rp, uint_t reg)
static int
dtrace_copycheck(uintptr_t uaddr, uintptr_t kaddr, size_t size)
{
- ASSERT(kaddr >= kernelbase && kaddr + size >= kaddr);
+ ASSERT(INKERNEL(kaddr) && kaddr + size >= kaddr);
- if (uaddr + size >= kernelbase || uaddr + size < uaddr) {
+ if (uaddr + size > VM_MAXUSER_ADDRESS || uaddr + size < uaddr) {
DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
cpu_core[curcpu].cpuc_dtrace_illval = uaddr;
return (0);
@@ -570,7 +568,7 @@ dtrace_copyoutstr(uintptr_t kaddr, uintptr_t uaddr, size_t size,
uint8_t
dtrace_fuword8(void *uaddr)
{
- if ((uintptr_t)uaddr >= kernelbase) {
+ if ((uintptr_t)uaddr > VM_MAXUSER_ADDRESS) {
DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr;
return (0);
@@ -581,7 +579,7 @@ dtrace_fuword8(void *uaddr)
uint16_t
dtrace_fuword16(void *uaddr)
{
- if ((uintptr_t)uaddr >= kernelbase) {
+ if ((uintptr_t)uaddr > VM_MAXUSER_ADDRESS) {
DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr;
return (0);
@@ -592,7 +590,7 @@ dtrace_fuword16(void *uaddr)
uint32_t
dtrace_fuword32(void *uaddr)
{
- if ((uintptr_t)uaddr >= kernelbase) {
+ if ((uintptr_t)uaddr > VM_MAXUSER_ADDRESS) {
DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr;
return (0);
@@ -603,7 +601,7 @@ dtrace_fuword32(void *uaddr)
uint64_t
dtrace_fuword64(void *uaddr)
{
- if ((uintptr_t)uaddr >= kernelbase) {
+ if ((uintptr_t)uaddr > VM_MAXUSER_ADDRESS) {
DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr;
return (0);
diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
index 4bf0f03..260b99b 100644
--- a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
@@ -40,7 +40,6 @@
#include <machine/frame.h>
#include <vm/pmap.h>
-extern uintptr_t kernelbase;
extern uintptr_t dtrace_in_probe_addr;
extern int dtrace_in_probe;
--
Andriy Gapon
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A423520.3000101>