xnu-517.9.5.tar.gz

[apple/xnu.git] / bsd / dev / ppc / unix_signal.c

diff --git a/bsd/dev/ppc/unix_signal.c b/bsd/dev/ppc/unix_signal.c
index 941ae0fe66d07ddab36b81c4c3b22550ebfa4020..501bc87e86c96a53aa4447e61d491bafc3c0113d 100644 (file)
--- a/bsd/dev/ppc/unix_signal.c
+++ b/bsd/dev/ppc/unix_signal.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -65,6 +62,7 @@
  */
  
 #define UC_TRAD                        1
+#define UC_TRAD_VEC            6
 #define UC_TRAD64              20
 #define UC_TRAD64_VEC          25
 #define UC_FLAVOR              30
@@ -95,6 +93,7 @@ sendsig(p, catcher, sig, mask, code)
        int sig, mask;
        u_long code;
 {
+       kern_return_t kretn;
        struct mcontext mctx, *p_mctx;
        struct mcontext64 mctx64, *p_mctx64;
        struct ucontext uctx, *p_uctx;
@@ -191,8 +190,7 @@ sendsig(p, catcher, sig, mask, code)
         }
 
 
-       vec_save(th_act);
-       if (find_user_vec(th_act)) {
+       if (find_user_vec_curr()) {
                vec_used = 1;
 
                 if ((ctx32 == 1) || dualcontext) {
@@ -201,7 +199,6 @@ sendsig(p, catcher, sig, mask, code)
                     state_count = PPC_VECTOR_STATE_COUNT;
                     if (thread_getstatus(th_act, flavor, (thread_state_t)tstate, &state_count)  != KERN_SUCCESS)
                     goto bad;
-                    infostyle += 5;
             } 
        
             if ((ctx32 == 0) || dualcontext) {
@@ -210,8 +207,8 @@ sendsig(p, catcher, sig, mask, code)
                     state_count = PPC_VECTOR_STATE_COUNT;
                     if (thread_getstatus(th_act, flavor, (thread_state_t)tstate, &state_count)  != KERN_SUCCESS)
                         goto bad;
-                    infostyle += 5;
            }
+        infostyle += 5;
        }  
 
        trampact = ps->ps_trampact[sig];
@@ -371,16 +368,16 @@ sendsig(p, catcher, sig, mask, code)
                goto bad;
        if (copyout((caddr_t)&sinfo, (caddr_t)p_sinfo, sizeof(siginfo_t)))
                goto bad;
-        if ((ctx32 == 0) || dualcontext) {
+       if ((ctx32 == 0) || dualcontext) {
                tstate = &mctx64;
-            if (copyout((caddr_t)tstate, (caddr_t)p_mctx64, uctx.uc_mcsize))
-               goto bad;
-        }
-        if ((ctx32 == 1) || dualcontext) {
+               if (copyout((caddr_t)tstate, (caddr_t)p_mctx64, (vec_used? UC_FLAVOR64_VEC_SIZE: UC_FLAVOR64_SIZE)))
+                       goto bad;
+       }
+       if ((ctx32 == 1) || dualcontext) {
                tstate = &mctx;
-            if (copyout((caddr_t)tstate, (caddr_t)p_mctx, uctx.uc_mcsize))
-               goto bad;
-        }    
+               if (copyout((caddr_t)tstate, (caddr_t)p_mctx, uctx.uc_mcsize))
+                       goto bad;
+       }    
 
 
        /* Place our arguments in arg registers: rtm dependent */
@@ -395,8 +392,8 @@ sendsig(p, catcher, sig, mask, code)
        mctx.ss.srr1 = get_msr_exportmask();    /* MSR_EXPORT_MASK_SET */
        mctx.ss.r1 = sp;
        state_count = PPC_THREAD_STATE_COUNT;
-       if (thread_setstatus(th_act, PPC_THREAD_STATE, &mctx.ss, &state_count)  != KERN_SUCCESS) {
-               goto bad;
+       if ((kretn = thread_setstatus(th_act, PPC_THREAD_STATE, &mctx.ss, &state_count))  != KERN_SUCCESS) {
+               panic("sendsig: thread_setstatus failed, ret = %08X\n", kretn);
        }       
        return;
 
@@ -424,6 +421,7 @@ bad:
 
 #define FOR64_TRANSITION 1
 
+
 #ifdef FOR64_TRANSITION
 
 struct osigreturn_args {
@@ -462,6 +460,18 @@ osigreturn(p, uap, retval)
        if (error = copyin(uap->uctx, &uctx, sizeof(struct ucontext))) {
                return(error);
        }
+       
+       /* validate the machine context size */
+       switch (uctx.uc_mcsize)  {
+               case UC_FLAVOR64_VEC_SIZE :
+               case UC_FLAVOR64_SIZE : 
+               case UC_FLAVOR_VEC_SIZE :
+               case UC_FLAVOR_SIZE:
+                       break;
+               default: 
+                       return(EINVAL);
+       }
+
        if (error = copyin(uctx.uc_mcontext, mactx, uctx.uc_mcsize)) {
                return(error);
        }
@@ -570,7 +580,16 @@ sigreturn(p, uap, retval)
                return(error);
        }
         
-        
+       /* validate the machine context size */
+       switch (uctx.uc_mcsize) {
+               case UC_FLAVOR64_VEC_SIZE:
+               case UC_FLAVOR64_SIZE:
+               case UC_FLAVOR_VEC_SIZE:
+               case UC_FLAVOR_SIZE:
+                       break;
+               default:
+                       return(EINVAL);
+       }
        if (error = copyin(uctx.uc_mcontext, mactx, uctx.uc_mcsize)) {
                return(error);
        }
@@ -600,8 +619,10 @@ sigreturn(p, uap, retval)
                     } 
                     break;
                case UC_FLAVOR_VEC :
+               case UC_TRAD_VEC :
                                 vec_used = 1;
                case UC_FLAVOR :
+               case UC_TRAD :
                default: {
                        p_mctx = (struct mcontext *)mactx;      
                        tsptr = (void *)&p_mctx->ss;