summaryrefslogtreecommitdiffstats
path: root/sys/pc98
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2006-03-14 16:13:55 +0000
committerjhb <jhb@FreeBSD.org>2006-03-14 16:13:55 +0000
commitaaa33da2edd23682521bc1bbbfa6ec1f33e6a9b6 (patch)
tree0e61856284edddd0e7369f6a41db457339ab7dc3 /sys/pc98
parentbaf4d3f4f12d3b17c7d2e9d7223d00263845e846 (diff)
downloadFreeBSD-src-aaa33da2edd23682521bc1bbbfa6ec1f33e6a9b6.zip
FreeBSD-src-aaa33da2edd23682521bc1bbbfa6ec1f33e6a9b6.tar.gz
Don't allow userland to set hardware watch points on kernel memory at all.
Previously, we tried to allow this only for root. However, we were calling suser() on the *target* process rather than the current process. This means that if you can ptrace() a process running as root you can set a hardware watch point in the kernel. In practice I think you probably have to be root in order to pass the p_candebug() checks in ptrace() to attach to a process running as root anyway. Rather than fix the suser(), I just axed the entire idea, as I can't think of any good reason _at all_ for userland to set hardware watch points for KVM. MFC after: 3 days Also thinks hardware watch points on KVM from userland are bad: bde, rwatson
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/pc98/machdep.c43
1 files changed, 20 insertions, 23 deletions
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 7b98290..fe6cfa5 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -2632,8 +2632,7 @@ set_dbregs(struct thread *td, struct dbreg *dbregs)
* could halt the system by setting a breakpoint in the kernel
* (if ddb was enabled). Thus, we need to check to make sure
* that no breakpoints are being enabled for addresses outside
- * process's address space, unless, perhaps, we were called by
- * uid 0.
+ * process's address space.
*
* XXX - what about when the watched area of the user's
* address space is written into from within the kernel
@@ -2641,30 +2640,28 @@ set_dbregs(struct thread *td, struct dbreg *dbregs)
* from within kernel mode?
*/
- if (suser(td) != 0) {
- if (dbregs->dr[7] & 0x3) {
- /* dr0 is enabled */
- if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS)
- return (EINVAL);
- }
+ if (dbregs->dr[7] & 0x3) {
+ /* dr0 is enabled */
+ if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS)
+ return (EINVAL);
+ }
- if (dbregs->dr[7] & (0x3<<2)) {
- /* dr1 is enabled */
- if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS)
- return (EINVAL);
- }
+ if (dbregs->dr[7] & (0x3<<2)) {
+ /* dr1 is enabled */
+ if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS)
+ return (EINVAL);
+ }
- if (dbregs->dr[7] & (0x3<<4)) {
- /* dr2 is enabled */
- if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS)
- return (EINVAL);
- }
+ if (dbregs->dr[7] & (0x3<<4)) {
+ /* dr2 is enabled */
+ if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS)
+ return (EINVAL);
+ }
- if (dbregs->dr[7] & (0x3<<6)) {
- /* dr3 is enabled */
- if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS)
- return (EINVAL);
- }
+ if (dbregs->dr[7] & (0x3<<6)) {
+ /* dr3 is enabled */
+ if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS)
+ return (EINVAL);
}
pcb->pcb_dr0 = dbregs->dr[0];
OpenPOWER on IntegriCloud