From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10156 invoked by alias); 21 Sep 2006 19:12:35 -0000 Received: (qmail 10139 invoked by uid 22791); 21 Sep 2006 19:12:35 -0000 X-Spam-Check-By: sourceware.org Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 21 Sep 2006 19:12:32 +0000 Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.mff.cuni.cz (8.13.1/8.13.1) with ESMTP id k8LJCLDA025194; Thu, 21 Sep 2006 21:12:21 +0200 Received: (from jj@localhost) by sunsite.mff.cuni.cz (8.13.1/8.13.1/Submit) id k8LJCHk8025190; Thu, 21 Sep 2006 21:12:17 +0200 Date: Thu, 21 Sep 2006 19:12:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers , Dwayne Grant McConnell , Steven Munroe Subject: [PATCH] Fix ppc{32,64} longjmp Message-ID: <20060921191216.GS4556@sunsite.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2006-09/txt/msg00045.txt.bz2 Hi! Stack pointer demangling in ppc{32,64} longjmp leaves for one (ppc64; or a couple (ppc32)) instruction(s) garbage in r1, which is bad if a signal comes in. Fixed thusly: 2006-09-21 Jakub Jelinek [BZ #3225] * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h (PTR_MANGLE3, PTR_DEMANGLE3): Define. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h (PTR_MANGLE3, PTR_DEMANGLE3): Likewise. * sysdeps/powerpc/powerpc32/__longjmp-common.S (__longjmp): Use it. * sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S (__longjmp): Likewise. * sysdeps/powerpc/powerpc64/__longjmp-common.S (__longjmp): Likewise. --- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h.jj 2006-01-02 11:39:05.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h 2006-09-21 17:46:56.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 1992,1997-2003,2004,2005 Free Software Foundation, Inc. +/* Copyright (C) 1992,1997-2003,2004,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -285,8 +285,12 @@ xor reg,tmpreg,reg # define PTR_MANGLE2(reg, tmpreg) \ xor reg,tmpreg,reg +# define PTR_MANGLE3(destreg, reg, tmpreg) \ + lwz tmpreg,POINTER_GUARD(r2); \ + xor destreg,tmpreg,reg # define PTR_DEMANGLE(reg, tmpreg) PTR_MANGLE (reg, tmpreg) # define PTR_DEMANGLE2(reg, tmpreg) PTR_MANGLE2 (reg, tmpreg) +# define PTR_DEMANGLE3(destreg, reg, tmpreg) PTR_MANGLE3 (destreg, reg, tmpreg) # else # define PTR_MANGLE(var) \ (var) = (__typeof (var)) ((uintptr_t) (var) ^ THREAD_GET_POINTER_GUARD ()) --- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h.jj 2006-01-11 16:55:32.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h 2006-09-21 17:47:49.000000000 +0200 @@ -299,8 +299,12 @@ xor reg,tmpreg,reg # define PTR_MANGLE2(reg, tmpreg) \ xor reg,tmpreg,reg +# define PTR_MANGLE3(destreg, reg, tmpreg) \ + ld tmpreg,POINTER_GUARD(r13); \ + xor destreg,tmpreg,reg # define PTR_DEMANGLE(reg, tmpreg) PTR_MANGLE (reg, tmpreg) # define PTR_DEMANGLE2(reg, tmpreg) PTR_MANGLE2 (reg, tmpreg) +# define PTR_DEMANGLE3(destreg, reg, tmpreg) PTR_MANGLE3 (destreg, reg, tmpreg) # else # define PTR_MANGLE(var) \ (var) = (__typeof (var)) ((uintptr_t) (var) ^ THREAD_GET_POINTER_GUARD ()) --- libc/sysdeps/powerpc/powerpc32/__longjmp-common.S.jj 2006-01-14 17:41:04.000000000 +0100 +++ libc/sysdeps/powerpc/powerpc32/__longjmp-common.S 2006-09-21 18:03:21.000000000 +0200 @@ -31,7 +31,11 @@ ENTRY (BP_SYM (__longjmp)) CHECK_BOUNDS_BOTH_WIDE_LIT (r3, r8, r9, JB_SIZE) +#ifdef PTR_DEMANGLE + lwz r24,(JB_GPR1*4)(r3) +#else lwz r1,(JB_GPR1*4)(r3) +#endif lwz r0,(JB_LR*4)(r3) lwz r14,((JB_GPRS+0)*4)(r3) lwz r15,((JB_GPRS+1)*4)(r3) @@ -41,8 +45,8 @@ ENTRY (BP_SYM (__longjmp)) lwz r19,((JB_GPRS+5)*4)(r3) lwz r20,((JB_GPRS+6)*4)(r3) #ifdef PTR_DEMANGLE - PTR_DEMANGLE (r0, r25) - PTR_DEMANGLE2 (r1, r25) + PTR_DEMANGLE3 (r1, r24, r25) + PTR_DEMANGLE2 (r0, r25) #endif mtlr r0 lwz r21,((JB_GPRS+7)*4)(r3) --- libc/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S.jj 2006-01-14 17:41:04.000000000 +0100 +++ libc/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S 2006-09-21 18:02:33.000000000 +0200 @@ -114,7 +114,11 @@ aligned_restore_vmx: lvx v31,0,r6 L(no_vmx): #endif +#ifdef PTR_DEMANGLE + lwz r24,(JB_GPR1*4)(r3) +#else lwz r1,(JB_GPR1*4)(r3) +#endif lwz r0,(JB_LR*4)(r3) lwz r14,((JB_GPRS+0)*4)(r3) lfd fp14,((JB_FPRS+0*2)*4)(r3) @@ -131,8 +135,8 @@ L(no_vmx): lwz r20,((JB_GPRS+6)*4)(r3) lfd fp20,((JB_FPRS+6*2)*4)(r3) #ifdef PTR_DEMANGLE - PTR_DEMANGLE (r0, r25) - PTR_DEMANGLE2 (r1, r25) + PTR_DEMANGLE3 (r1, r24, r25) + PTR_DEMANGLE2 (r0, r25) #endif mtlr r0 lwz r21,((JB_GPRS+7)*4)(r3) --- libc/sysdeps/powerpc/powerpc64/__longjmp-common.S.jj 2006-01-14 17:41:04.000000000 +0100 +++ libc/sysdeps/powerpc/powerpc64/__longjmp-common.S 2006-09-21 18:01:05.000000000 +0200 @@ -108,9 +108,11 @@ aligned_restore_vmx: lvx v31,0,r6 L(no_vmx): #endif - ld r1,(JB_GPR1*8)(r3) #ifdef PTR_DEMANGLE - PTR_DEMANGLE (r1, r25) + ld r22,(JB_GPR1*8)(r3) + PTR_DEMANGLE3 (r1, r22, r25) +#else + ld r1,(JB_GPR1*8)(r3) #endif ld r2,(JB_GPR2*8)(r3) ld r0,(JB_LR*8)(r3) Jakub