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

Message-ID: <20130111100357.GA12977@mudshark.cambridge.arm.com>
Date:	Fri, 11 Jan 2013 10:03:57 +0000
From:	Will Deacon <will.deacon@....com>
To:	Catalin Marinas <catalin.marinas@....com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Al Viro <viro@...IV.linux.org.uk>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the signal tree with the arm64 tree

On Fri, Jan 11, 2013 at 09:36:02AM +0000, Catalin Marinas wrote:
> Hi Stephen,
> 
> On Fri, Jan 11, 2013 at 04:46:17AM +0000, Stephen Rothwell wrote:
> > Today's linux-next merge of the signal tree got a conflict in
> > arch/arm64/kernel/signal32.c between commits 068f1bb36cf1 ("arm64:
> > compat: include sa_restorer in old action from rt_sigaction") and
> > efed4d52e39f ("arm64: compat: ensure access_ok checks are performed on
> > user structures") from the arm64 tree and various commits from the signal
> > tree.
> > 
> > The latter removes the code modified by the former, so I did that.
> 
> I think the fix is fine. I'll give Al's patches a test and I can
> probably drop Will's patches.

Yup, although it looks like we need to #define __ARCH_HAS_SA_RESTORER for
compat_sys_rt_sigaction.

Will
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/