linux-kernel - linux-next: manual merge of the signal tree with the sparc 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20121029140032.4019da59dbc50a9be8df9ebc@canb.auug.org.au>
Date:	Mon, 29 Oct 2012 14:00:32 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"David S. Miller" <davem@...emloft.net>
Subject: linux-next: manual merge of the signal tree with the sparc tree

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/sparc/kernel/sys_sparc_64.c between commit 517ffce4e1a0 ("sparc64:
Make montmul/montsqr/mpmul usable in 32-bit threads") from the sparc tree
and commit 2f12af35a988 ("sparc64: switch to generic kernel_execve()")
from the signal 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/sparc/kernel/sys_sparc_64.c
index 878ef3d,adfe60e..0000000
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@@ -729,30 -729,3 +729,8 @@@ SYSCALL_DEFINE5(rt_sigaction, int, sig
  
  	return ret;
  }
 +
- /*
-  * Do a system call from kernel instead of calling sys_execve so we
-  * end up with proper pt_regs.
-  */
- int kernel_execve(const char *filename,
- 		  const char *const argv[],
- 		  const char *const envp[])
- {
- 	long __res;
- 	register long __g1 __asm__ ("g1") = __NR_execve;
- 	register long __o0 __asm__ ("o0") = (long)(filename);
- 	register long __o1 __asm__ ("o1") = (long)(argv);
- 	register long __o2 __asm__ ("o2") = (long)(envp);
- 	asm volatile ("t 0x6d\n\t"
- 		      "sub %%g0, %%o0, %0\n\t"
- 		      "movcc %%xcc, %%o0, %0\n\t"
- 		      : "=r" (__res), "=&r" (__o0)
- 		      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1)
- 		      : "cc");
- 	return __res;
- }
- 
 +asmlinkage long sys_kern_features(void)
 +{
 +	return KERN_FEATURE_MIXED_MODE_STACK;
 +}

Content of type "application/pgp-signature" skipped