linux-kernel - Re: linux-next: manual merge of the security-testing tree with the arm 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20090914130355.ff26d669.sfr@canb.auug.org.au>
Date:	Mon, 14 Sep 2009 13:03:55 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Russell King <rmk@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mikael Pettersson <mikpe@...uu.se>,
	James Morris <jmorris@...ei.org>,
	David Howells <dhowells@...hat.com>
Subject: Re: linux-next: manual merge of the security-testing tree with the
 arm tree

Hi Russell,

On Thu, 3 Sep 2009 15:47:00 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the security-testing tree got a conflicts in
> arch/arm/kernel/signal.c between commit
> 369842658a36bcea28ecb643ba4bdb53919330dd ("ARM: 5677/1: ARM support for
> TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait") from the arm tree and
> commits d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend
> TIF_NOTIFY_RESUME to (almost) all architectures [try #6]") and
> ee18d64c1f632043a02e6f5ba5e045bb26a5465f ("KEYS: Add a keyctl to install
> a process's session keyring on its parent [try #6]") from the
> security-testing tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

This is now a conflict between the arm tree and Linus' tree (as the
security-testing tree has been merged).

> diff --cc arch/arm/kernel/signal.c
> index f7194e4,ea4ad3a..0000000
> --- a/arch/arm/kernel/signal.c
> +++ b/arch/arm/kernel/signal.c
> @@@ -694,5 -706,12 +694,12 @@@ asmlinkage voi
>   do_notify_resume(struct pt_regs *regs, unsigned int thread_flags, int syscall)
>   {
>   	if (thread_flags & _TIF_SIGPENDING)
>  -		do_signal(&current->blocked, regs, syscall);
>  +		do_signal(regs, syscall);
> + 
> + 	if (thread_flags & _TIF_NOTIFY_RESUME) {
> + 		clear_thread_flag(TIF_NOTIFY_RESUME);
> + 		tracehook_notify_resume(regs);
> + 		if (current->replacement_session_keyring)
> + 			key_replace_session_keyring();
> + 	}
>   }
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped