linux-kernel - linux-next: manual merge of the signal tree with the rcu 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]

Date:	Mon, 6 Aug 2012 13:13:55 +1000
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,
	Frederic Weisbecker <fweisbec@...il.com>,
	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
Subject: linux-next: manual merge of the signal tree with the rcu tree

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/x86/kernel/signal.c between commit 1ea856be75ce ("x86: Exit RCU
extended QS on notify resume") from the rcu tree and commit 02bf6b04fcd5
("x86: switch uses of TIF_IRET to TIF_NOTIFY_RESUME, kill TIF_IRET") from
the signal tree.

Just context changes.  I have fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/x86/kernel/signal.c
index bca0ab9,16f61c4..0000000
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@@ -802,12 -797,6 +802,8 @@@ do_notify_resume(struct pt_regs *regs, 
  	}
  	if (thread_info_flags & _TIF_USER_RETURN_NOTIFY)
  		fire_user_return_notifiers();
 +
- #ifdef CONFIG_X86_32
- 	clear_thread_flag(TIF_IRET);
- #endif /* CONFIG_X86_32 */
- 
 +	rcu_user_enter();
  }
  
  void signal_fault(struct pt_regs *regs, void __user *frame, char *where)

Content of type "application/pgp-signature" skipped