Attachment 148610 Details for Bug 194570 – proposed patch

[patch] proposed patch

sigfix.patch (text/plain), 1.43 KB, created by Archana K. Raghavan on 2007-02-22 19:16:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Archana K. Raghavan

Created: 2007-02-22 19:16:11 UTC

Size: 1.43 KB

patch

obsolete

>diff -urN linux-2.6.9.orig/arch/ppc64/kernel/signal.c linux-2.6.9/arch/ppc64/kernel/signal.c
>--- linux-2.6.9.orig/arch/ppc64/kernel/signal.c	2007-02-12 16:13:02.000000000 +1100
>+++ linux-2.6.9/arch/ppc64/kernel/signal.c	2007-02-22 15:32:03.000000000 +1100
>@@ -372,7 +372,7 @@
> 	 */
> 	do_sigaltstack(&uc->uc_stack, NULL, regs->gpr[1]);
> 
>-	return regs->result;
>+	return 0;
> 
> badframe:
> #if DEBUG_SIG
>@@ -492,6 +492,8 @@
> 		 * we only get here if there is a handler, we dont restart.
> 		 */
> 		regs->result = -EINTR;
>+		regs->gpr[3] = EINTR;
>+		/* note cr0.SO is already set */
> 		break;
> 	case -ERESTARTSYS:
> 		/* ERESTARTSYS means to restart the syscall if there is no
>@@ -499,6 +501,7 @@
> 		 */
> 		if (!(ka->sa.sa_flags & SA_RESTART)) {
> 			regs->result = -EINTR;
>+			regs->gpr[3] = EINTR;
> 			break;
> 		}
> 		/* fallthrough */
>diff -urN linux-2.6.9.orig/arch/ppc64/kernel/signal32.c linux-2.6.9/arch/ppc64/kernel/signal32.c
>--- linux-2.6.9.orig/arch/ppc64/kernel/signal32.c	2007-02-12 16:13:02.000000000 +1100
>+++ linux-2.6.9/arch/ppc64/kernel/signal32.c	2007-02-22 15:33:16.000000000 +1100
>@@ -810,9 +810,7 @@
> 	 */
>        	sys32_sigaltstack((u32)(u64)&rt_sf->uc.uc_stack, 0, 0, 0, 0, 0, regs);
> 
>-	ret = regs->result;
>-
>-	return ret;
>+	return 0;
> 
>  bad:
> 	force_sig(SIGSEGV, current);
>@@ -914,8 +912,7 @@
> 	    || restore_user_regs(regs, sr, 1))
> 		goto badframe;
> 
>-	ret = regs->result;
>-	return ret;
>+	return 0;
> 
> badframe:
> 	force_sig(SIGSEGV, current);

Actions: View | Diff

Attachments on bug 194570: 130802 | 144549 | 144550 | 148610 | 148611