Attachment 188772 Details for Bug 224293 – Patch that fixes the problem

[patch] Patch that fixes the problem

0001-Do-not-use-a-undefined-variable.patch (text/plain), 1.42 KB, created by Breno Leitao on 2017-12-12 20:24:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Breno Leitao

Created: 2017-12-12 20:24:24 UTC

Size: 1.42 KB

patch

obsolete

>From 1d92f828ae47b398e050a35d05a76937466d190c Mon Sep 17 00:00:00 2001
>From: Breno Leitao <breno.leitao@gmail.com>
>Date: Tue, 12 Dec 2017 21:15:34 +0100
>Subject: [PATCH] Do not use a undefined variable
>
>Currently fasttrap_pid_probe() is using a undefined variable, which causes
>the kernel build to fail on powerpc when using a newer compiler.
>
>This patch simply derefence ->pc after rp is defined.
>
>This regression was added by commit
>b0b9b4fcf4a7a712c3270a5fde519c199b11fc87('Pass the trap frame to fasttrap
>hooks.');
>---
> sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c b/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
>index a2732cb5d56..69ba0f3c64d 100644
>--- a/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
>+++ b/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
>@@ -333,7 +333,7 @@ fasttrap_pid_probe(struct trapframe *frame)
> 	struct reg reg, *rp;
> 	struct rm_priotracker tracker;
> 	proc_t *p = curproc;
>-	uintptr_t pc = rp->pc;
>+	uintptr_t pc;
> 	uintptr_t new_pc = 0;
> 	fasttrap_bucket_t *bucket;
> 	fasttrap_tracepoint_t *tp, tp_local;
>@@ -343,6 +343,7 @@ fasttrap_pid_probe(struct trapframe *frame)
> 
> 	fill_regs(curthread, &reg);
> 	rp = &reg;
>+	pc = rp->pc;
> 
> 	/*
> 	 * It's possible that a user (in a veritable orgy of bad planning)
>-- 
>2.13.2
>

Actions: View | Diff

Attachments on bug 224293: 188772