Attachment 41174 Details for Bug 87244

Backport to 2.4.21

ar-rsc-fixup (text/plain), 3.04 KB, created by Andreas Schwab on 2005-07-05 15:41:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schwab

Created: 2005-07-05 15:41:19 UTC

Size: 3.04 KB

patch

obsolete

>--- linux-2.4.21/arch/ia64/kernel/ptrace.c.~1~	2005-07-05 16:30:24.190901663 +0200
>+++ linux-2.4.21/arch/ia64/kernel/ptrace.c	2005-07-05 16:32:16.211514373 +0200
>@@ -820,6 +820,13 @@ access_uarea (struct task_struct *child,
> 				*data = (pt->cr_ipsr & IPSR_READ_MASK);
> 			return 0;
> 
>+		      case PT_AR_RSC:
>+			if (write_access)
>+				pt->ar_rsc = *data | (3 << 2); /* force PL3 */
>+			else
>+				*data = pt->ar_rsc;
>+			return 0;
>+
> 		      case PT_AR_RNAT:
> 			urbs_end = ia64_get_user_rbs_end(child, pt, NULL);
> 			rnat_addr = (long) ia64_rse_rnat_addr((long *) urbs_end);
>@@ -839,7 +846,7 @@ access_uarea (struct task_struct *child,
> 		      case PT_F6:  case PT_F6+8: case PT_F7: case PT_F7+8:
> 		      case PT_F8:  case PT_F8+8: case PT_F9: case PT_F9+8:
> 		      case PT_AR_BSPSTORE:
>-		      case PT_AR_RSC: case PT_AR_UNAT: case PT_AR_PFS:
>+		      case PT_AR_UNAT: case PT_AR_PFS:
> 		      case PT_AR_CCV: case PT_AR_FPSR: case PT_CR_IIP: case PT_PR:
> 			/* scratch register */
> 			ptr = (unsigned long *) ((long) pt + addr - PT_CR_IPSR);
>@@ -1068,13 +1075,13 @@ ptrace_setregs (struct task_struct *chil
> 	/* app regs */
> 
> 	retval |= __get_user(pt->ar_pfs, &ppr->ar[PT_AUR_PFS]);
>-	retval |= __get_user(pt->ar_rsc, &ppr->ar[PT_AUR_RSC]);
> 	retval |= __get_user(pt->ar_bspstore, &ppr->ar[PT_AUR_BSPSTORE]);
> 	retval |= __get_user(pt->ar_unat, &ppr->ar[PT_AUR_UNAT]);
> 	retval |= __get_user(pt->ar_ccv, &ppr->ar[PT_AUR_CCV]);
> 	retval |= __get_user(pt->ar_fpsr, &ppr->ar[PT_AUR_FPSR]);
> 
> 	retval |= access_uarea(child, PT_AR_EC, &ppr->ar[PT_AUR_EC], 1);
>+	retval |= access_uarea(child, PT_AR_RSC, &ppr->ar[PT_AUR_RSC], 1);
> 	retval |= access_uarea(child, PT_AR_LC, &ppr->ar[PT_AUR_LC], 1);
> 	retval |= access_uarea(child, PT_AR_RNAT, &ppr->ar[PT_AUR_RNAT], 1);
> 	retval |= access_uarea(child, PT_AR_BSP, &ppr->ar[PT_AUR_BSP], 1);
>--- linux-2.4.21/arch/ia64/kernel/signal.c.~1~	2005-07-05 16:30:22.651837731 +0200
>+++ linux-2.4.21/arch/ia64/kernel/signal.c	2005-07-05 16:33:52.907894962 +0200
>@@ -105,7 +105,7 @@ sys_sigaltstack (const stack_t *uss, sta
> static long
> restore_sigcontext (struct sigcontext *sc, struct sigscratch *scr)
> {
>-	unsigned long ip, flags, nat, um, cfm;
>+	unsigned long ip, flags, nat, um, cfm, rsc;
> 	long err;
> 
> 	/* restore scratch that always needs gets updated during signal delivery: */
>@@ -115,7 +115,7 @@ restore_sigcontext (struct sigcontext *s
> 	err |= __get_user(ip, &sc->sc_ip);			/* instruction pointer */
> 	err |= __get_user(cfm, &sc->sc_cfm);
> 	err |= __get_user(um, &sc->sc_um);			/* user mask */
>-	err |= __get_user(scr->pt.ar_rsc, &sc->sc_ar_rsc);
>+	err |= __get_user(rsc, &sc->sc_ar_rsc);
> 	err |= __get_user(scr->pt.ar_ccv, &sc->sc_ar_ccv);
> 	err |= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat);
> 	err |= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr);
>@@ -130,6 +130,7 @@ restore_sigcontext (struct sigcontext *s
> 	err |= __copy_from_user(&scr->pt.r16, &sc->sc_gr[16], 16*8);	/* r16-r31 */
> 
> 	scr->pt.cr_ifs = cfm | (1UL << 63);
>+	scr->pt.ar_rsc = rsc | (3 << 2); /* force PL3 */
> 
> 	/* establish new instruction pointer: */
> 	scr->pt.cr_iip = ip & ~0x3UL;

Actions: View

Attachments on bug 87244: 38758 | 39006 | 39074 | 41174