Page MenuHomeFreeBSD
Files F149675195

D18421.id.diff
No OneTemporary
Actions

D18421.id.diff
View Options

Index: head/sys/amd64/amd64/machdep.c
===================================================================
--- head/sys/amd64/amd64/machdep.c
+++ head/sys/amd64/amd64/machdep.c
@@ -2045,6 +2045,7 @@
int
fill_frame_regs(struct trapframe *tp, struct reg *regs)
{
+
regs->r_r15 = tp->tf_r15;
regs->r_r14 = tp->tf_r14;
regs->r_r13 = tp->tf_r13;
@@ -2076,6 +2077,8 @@
regs->r_fs = 0;
regs->r_gs = 0;
}
+ regs->r_err = 0;
+ regs->r_trapno = 0;
return (0);
}
Index: head/sys/amd64/ia32/ia32_reg.c
===================================================================
--- head/sys/amd64/ia32/ia32_reg.c
+++ head/sys/amd64/ia32/ia32_reg.c
@@ -105,6 +105,8 @@
regs->r_eflags = tp->tf_rflags;
regs->r_esp = tp->tf_rsp;
regs->r_ss = tp->tf_ss;
+ regs->r_err = 0;
+ regs->r_trapno = 0;
return (0);
}
Index: head/sys/arm/arm/machdep_kdb.c
===================================================================
--- head/sys/arm/arm/machdep_kdb.c
+++ head/sys/arm/arm/machdep_kdb.c
@@ -104,6 +104,7 @@
regs->r_cpsr = tf->tf_spsr;
return (0);
}
+
int
fill_fpregs(struct thread *td, struct fpreg *regs)
{
@@ -134,8 +135,11 @@
int
fill_dbregs(struct thread *td, struct dbreg *regs)
{
+
+ bzero(regs, sizeof(*regs));
return (0);
}
+
int
set_dbregs(struct thread *td, struct dbreg *regs)
{
Index: head/sys/fs/procfs/procfs_dbregs.c
===================================================================
--- head/sys/fs/procfs/procfs_dbregs.c
+++ head/sys/fs/procfs/procfs_dbregs.c
@@ -112,8 +112,10 @@
return (EINVAL);
}
wrap32 = 1;
- }
+ memset(&r32, 0, sizeof(r32));
+ } else
#endif
+ memset(&r, 0, sizeof(r));
error = PROC(read, dbregs, td2, &r);
if (error == 0) {
PROC_UNLOCK(p);
Index: head/sys/fs/procfs/procfs_fpregs.c
===================================================================
--- head/sys/fs/procfs/procfs_fpregs.c
+++ head/sys/fs/procfs/procfs_fpregs.c
@@ -102,7 +102,6 @@
return (EBUSY);
}
- /* XXXKSE: */
td2 = FIRST_THREAD_IN_PROC(p);
#ifdef COMPAT_FREEBSD32
if (SV_CURPROC_FLAG(SV_ILP32)) {
@@ -111,8 +110,10 @@
return (EINVAL);
}
wrap32 = 1;
- }
+ memset(&r32, 0, sizeof(r32));
+ } else
#endif
+ memset(&r, 0, sizeof(r));
error = PROC(read, fpregs, td2, &r);
if (error == 0) {
PROC_UNLOCK(p);
Index: head/sys/fs/procfs/procfs_regs.c
===================================================================
--- head/sys/fs/procfs/procfs_regs.c
+++ head/sys/fs/procfs/procfs_regs.c
@@ -102,7 +102,6 @@
return (EBUSY);
}
- /* XXXKSE: */
td2 = FIRST_THREAD_IN_PROC(p);
#ifdef COMPAT_FREEBSD32
if (SV_CURPROC_FLAG(SV_ILP32)) {
@@ -111,8 +110,10 @@
return (EINVAL);
}
wrap32 = 1;
- }
+ memset(&r32, 0, sizeof(r32));
+ } else
#endif
+ memset(&r, 0, sizeof(r));
error = PROC(read, regs, td2, &r);
if (error == 0) {
PROC_UNLOCK(p);
Index: head/sys/i386/i386/machdep.c
===================================================================
--- head/sys/i386/i386/machdep.c
+++ head/sys/i386/i386/machdep.c
@@ -2816,6 +2816,7 @@
int
fill_frame_regs(struct trapframe *tp, struct reg *regs)
{
+
regs->r_fs = tp->tf_fs;
regs->r_es = tp->tf_es;
regs->r_ds = tp->tf_ds;
@@ -2831,6 +2832,8 @@
regs->r_eflags = tp->tf_eflags;
regs->r_esp = tp->tf_esp;
regs->r_ss = tp->tf_ss;
+ regs->r_err = 0;
+ regs->r_trapno = 0;
return (0);
}
Index: head/sys/kern/sys_process.c
===================================================================
--- head/sys/kern/sys_process.c
+++ head/sys/kern/sys_process.c
@@ -541,6 +541,9 @@
* copyin(uap->addr, &r.reg32, sizeof r.reg32);
* .. except this is done at runtime.
*/
+#define BZERO(a, s) wrap32 ? \
+ bzero(a ## 32, s ## 32) : \
+ bzero(a, s)
#define COPYIN(u, k, s) wrap32 ? \
copyin(u, k ## 32, s ## 32) : \
copyin(u, k, s)
@@ -573,7 +576,7 @@
struct ptrace_lwpinfo32 pl32;
struct ptrace_vm_entry32 pve32;
#endif
- char args[nitems(td->td_sa.args) * sizeof(register_t)];
+ char args[sizeof(td->td_sa.args)];
int ptevents;
} r;
void *addr;
@@ -590,11 +593,17 @@
addr = &r;
switch (uap->req) {
case PT_GET_EVENT_MASK:
+ case PT_LWPINFO:
+ case PT_GET_SC_ARGS:
+ break;
case PT_GETREGS:
+ BZERO(&r.reg, sizeof r.reg);
+ break;
case PT_GETFPREGS:
+ BZERO(&r.fpreg, sizeof r.fpreg);
+ break;
case PT_GETDBREGS:
- case PT_LWPINFO:
- case PT_GET_SC_ARGS:
+ BZERO(&r.dbreg, sizeof r.dbreg);
break;
case PT_SETREGS:
error = COPYIN(uap->addr, &r.reg, sizeof r.reg);
@@ -662,6 +671,7 @@
}
#undef COPYIN
#undef COPYOUT
+#undef BZERO
#ifdef COMPAT_FREEBSD32
/*
Index: head/sys/sparc64/sparc64/machdep.c
===================================================================
--- head/sys/sparc64/sparc64/machdep.c
+++ head/sys/sparc64/sparc64/machdep.c
@@ -1056,6 +1056,7 @@
bcopy(pcb->pcb_ufp, fpregs->fr_regs, sizeof(fpregs->fr_regs));
fpregs->fr_fsr = tf->tf_fsr;
fpregs->fr_gsr = tf->tf_gsr;
+ fpregs->fr_pad[0] = 0;
return (0);
}

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 27, 4:37 AM (1 m, 18 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30382561
Default Alt Text
D18421.id.diff (4 KB)

Event Timeline