Author: avg
Date: Thu Jul 9 13:48:06 2009
New Revision: 195492
URL: http://svn.freebsd.org/changeset/base/195492
Log:
MFC 194850: dtrace/amd64: fix virtual address checks
Modified:
stable/7/sys/ (props changed)
stable/7/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
==============================================================================
--- stable/7/sys/cddl/dev/dtrace/amd64/dtrace_isa.c Thu Jul 9 13:42:18
2009 (r195491)
+++ stable/7/sys/cddl/dev/dtrace/amd64/dtrace_isa.c Thu Jul 9 13:48:06
2009 (r195492)
@@ -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 re
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, uintp
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);
Modified: stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
==============================================================================
--- stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Thu Jul 9 13:42:18
2009 (r195491)
+++ stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Thu Jul 9 13:48:06
2009 (r195492)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
