Attachment #61872 for bug #96982

View | Details | Raw Unified | Return to bug 96982
Collapse All | Expand All

Lines 945-950 access_uarea (struct task_struct *child, Link Here

(-)a/arch/ia64/kernel/ptrace.c (-5 / +10 lines)
945	*data = (pt->cr_ipsr & IPSR_MASK);	945	*data = (pt->cr_ipsr & IPSR_MASK);
946	return 0;	946	return 0;
947		947
		948	case PT_AR_RSC:
		949	if (write_access)
		950	pt->ar_rsc = data \| (3 << 2); / force PL3 */
		951	else
		952	*data = pt->ar_rsc;
		953	return 0;
		954
948	case PT_AR_RNAT:	955	case PT_AR_RNAT:
949	urbs_end = ia64_get_user_rbs_end(child, pt, NULL);	956	urbs_end = ia64_get_user_rbs_end(child, pt, NULL);
950	rnat_addr = (long) ia64_rse_rnat_addr((long *)	957	rnat_addr = (long) ia64_rse_rnat_addr((long *)
Lines 996-1004 access_uarea (struct task_struct *child, Link Here
996	case PT_AR_BSPSTORE:	1003	case PT_AR_BSPSTORE:
997	ptr = pt_reg_addr(pt, ar_bspstore);	1004	ptr = pt_reg_addr(pt, ar_bspstore);
998	break;	1005	break;
999	case PT_AR_RSC:
1000	ptr = pt_reg_addr(pt, ar_rsc);
1001	break;
1002	case PT_AR_UNAT:	1006	case PT_AR_UNAT:
1003	ptr = pt_reg_addr(pt, ar_unat);	1007	ptr = pt_reg_addr(pt, ar_unat);
1004	break;	1008	break;
Lines 1234-1240 ptrace_getregs (struct task_struct *chil Link Here
1234	static long	1238	static long
1235	ptrace_setregs (struct task_struct child, struct pt_all_user_regs __user ppr)	1239	ptrace_setregs (struct task_struct child, struct pt_all_user_regs __user ppr)
1236	{	1240	{
1237	unsigned long psr, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;	1241	unsigned long psr, rsc, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;
1238	struct unw_frame_info info;	1242	struct unw_frame_info info;
1239	struct switch_stack *sw;	1243	struct switch_stack *sw;
1240	struct ia64_fpreg fpval;	1244	struct ia64_fpreg fpval;
Lines 1267-1273 ptrace_setregs (struct task_struct *chil Link Here
1267	/* app regs */	1271	/* app regs */
1268		1272
1269	retval \|= __get_user(pt->ar_pfs, &ppr->ar[PT_AUR_PFS]);	1273	retval \|= __get_user(pt->ar_pfs, &ppr->ar[PT_AUR_PFS]);
1270	retval \|= __get_user(pt->ar_rsc, &ppr->ar[PT_AUR_RSC]);	1274	retval \|= __get_user(rsc, &ppr->ar[PT_AUR_RSC]);
1271	retval \|= __get_user(pt->ar_bspstore, &ppr->ar[PT_AUR_BSPSTORE]);	1275	retval \|= __get_user(pt->ar_bspstore, &ppr->ar[PT_AUR_BSPSTORE]);
1272	retval \|= __get_user(pt->ar_unat, &ppr->ar[PT_AUR_UNAT]);	1276	retval \|= __get_user(pt->ar_unat, &ppr->ar[PT_AUR_UNAT]);
1273	retval \|= __get_user(pt->ar_ccv, &ppr->ar[PT_AUR_CCV]);	1277	retval \|= __get_user(pt->ar_ccv, &ppr->ar[PT_AUR_CCV]);
Lines 1365-1370 ptrace_setregs (struct task_struct *chil Link Here
1365	retval \|= __get_user(nat_bits, &ppr->nat);	1369	retval \|= __get_user(nat_bits, &ppr->nat);
1366		1370
1367	retval \|= access_uarea(child, PT_CR_IPSR, &psr, 1);	1371	retval \|= access_uarea(child, PT_CR_IPSR, &psr, 1);
		1372	retval \|= access_uarea(child, PT_AR_RSC, &rsc, 1);
1368	retval \|= access_uarea(child, PT_AR_EC, &ec, 1);	1373	retval \|= access_uarea(child, PT_AR_EC, &ec, 1);
1369	retval \|= access_uarea(child, PT_AR_LC, &lc, 1);	1374	retval \|= access_uarea(child, PT_AR_LC, &lc, 1);
1370	retval \|= access_uarea(child, PT_AR_RNAT, &rnat, 1);	1375	retval \|= access_uarea(child, PT_AR_RNAT, &rnat, 1);




static long
restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
{
	unsigned long ip, flags, nat, um, cfm, rsc;
	long err;

	/* Always make any pending restarted system calls return -EINTR */

	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(rsc, &sc->sc_ar_rsc);
	err |= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat);
	err |= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr);
	err |= __get_user(scr->pt.ar_pfs, &sc->sc_ar_pfs);

	err |= __copy_from_user(&scr->pt.r15, &sc->sc_gr[15], 8);	/* r15 */

	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;

Lines 649-654 static inline int de_thread(struct task_ Link Here

(-)a/fs/exec.c (+1 lines)
649	}	649	}
650	sig->group_exit_task = NULL;	650	sig->group_exit_task = NULL;
651	sig->notify_count = 0;	651	sig->notify_count = 0;
		652	sig->real_timer.data = (unsigned long)current;
652	spin_unlock_irq(lock);	653	spin_unlock_irq(lock);
653		654
654	/*	655	/*

Return to bug 96982

Lines 94-100 sys_sigaltstack (const stack_t __user *u Link Here

(-)a/arch/ia64/kernel/signal.c (-2 / +3 lines)
94	static long	94	static long
95	restore_sigcontext (struct sigcontext __user sc, struct sigscratch scr)	95	restore_sigcontext (struct sigcontext __user sc, struct sigscratch scr)
96	{	96	{
97	unsigned long ip, flags, nat, um, cfm;	97	unsigned long ip, flags, nat, um, cfm, rsc;
98	long err;	98	long err;
99		99
100	/* Always make any pending restarted system calls return -EINTR */	100	/* Always make any pending restarted system calls return -EINTR */
Lines 106-112 restore_sigcontext (struct sigcontext __ Link Here
106	err \|= __get_user(ip, &sc->sc_ip); /* instruction pointer */	106	err \|= __get_user(ip, &sc->sc_ip); /* instruction pointer */
107	err \|= __get_user(cfm, &sc->sc_cfm);	107	err \|= __get_user(cfm, &sc->sc_cfm);
108	err \|= __get_user(um, &sc->sc_um); /* user mask */	108	err \|= __get_user(um, &sc->sc_um); /* user mask */
109	err \|= __get_user(scr->pt.ar_rsc, &sc->sc_ar_rsc);	109	err \|= __get_user(rsc, &sc->sc_ar_rsc);
110	err \|= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat);	110	err \|= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat);
111	err \|= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr);	111	err \|= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr);
112	err \|= __get_user(scr->pt.ar_pfs, &sc->sc_ar_pfs);	112	err \|= __get_user(scr->pt.ar_pfs, &sc->sc_ar_pfs);
Lines 119-124 restore_sigcontext (struct sigcontext __ Link Here
119	err \|= __copy_from_user(&scr->pt.r15, &sc->sc_gr[15], 8); /* r15 */	119	err \|= __copy_from_user(&scr->pt.r15, &sc->sc_gr[15], 8); /* r15 */
120		120
121	scr->pt.cr_ifs = cfm \| (1UL << 63);	121	scr->pt.cr_ifs = cfm \| (1UL << 63);
		122	scr->pt.ar_rsc = rsc \| (3 << 2); /* force PL3 */
122		123
123	/* establish new instruction pointer: */	124	/* establish new instruction pointer: */
124	scr->pt.cr_iip = ip & ~0x3UL;	125	scr->pt.cr_iip = ip & ~0x3UL;