linux-kernel - linux-next: manual merge of the powerpc tree with the signal tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20121115170336.acc55b1d7f4eb656518a8f98@canb.auug.org.au>
Date:	Thu, 15 Nov 2012 17:03:36 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	Paul Mackerras <paulus@...ba.org>,
	<linuxppc-dev@...ts.ozlabs.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Li Zhong <zhong@...ux.vnet.ibm.com>,
	Al Viro <viro@...IV.linux.org.uk>
Subject: linux-next: manual merge of the powerpc tree with the signal tree

Hi all,

Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/kernel/entry_64.S between commits 40792104b255 ("powerpc:
don't mess with r2 in copy_thread() and friends") and 53b50f9483cc
("powerpc: take dereferencing to ret_from_kernel_thread()") from the
signal tree and commit 12660b170253 ("powerpc: Fix
MAX_STACK_TRACE_ENTRIES too low warning !") from the powerpc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/powerpc/kernel/entry_64.S
index e9a906c,ad76666..0000000
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@@ -373,7 -373,9 +373,9 @@@ _GLOBAL(ret_from_fork
  _GLOBAL(ret_from_kernel_thread)
  	bl	.schedule_tail
  	REST_NVGPRS(r1)
 -	REST_GPR(2,r1)
 +	ld	r14, 0(r14)
+ 	li	r3,0
+ 	std	r3,0(r1)
  	mtlr	r14
  	mr	r3,r15
  	blrl

Content of type "application/pgp-signature" skipped