From 58d70cb91470d0a74812401849f407b1e1ef8b6d Mon Sep 17 00:00:00 2001
From: tobhe <tobhe@openbsd.org>
Date: Thu, 20 Jan 2022 14:02:51 +0000
Subject: [PATCH] Don't return uninitialized stack memory on copyin() error.
 Found with clang static analyzer.

ok gkoehler@
---
 sys/arch/powerpc/powerpc/trap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c
index 5831bc1cf7e..6e12ceb4ee4 100644
--- a/sys/arch/powerpc/powerpc/trap.c
+++ b/sys/arch/powerpc/powerpc/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.123 2021/12/09 00:26:11 guenther Exp $	*/
+/*	$OpenBSD: trap.c,v 1.124 2022/01/20 14:02:51 tobhe Exp $	*/
 /*	$NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $	*/
 
 /*
@@ -419,10 +419,10 @@ trap(struct trapframe *frame)
 			/* nothing to do */
 			break;
 		default:
+			frame->fixreg[FIRSTARG + 1] = rval[1];
 		bad:
 			frame->fixreg[0] = error;
 			frame->fixreg[FIRSTARG] = error;
-			frame->fixreg[FIRSTARG + 1] = rval[1];
 			frame->cr |= 0x10000000;
 			break;
 		}
-- 
2.20.1