Date: Fri, 27 Feb 2015 10:26:44 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Ingo Molnar <mingo@kernel.org>, Hector Marco Gisbert <hecmargi@upv.es>,
        Kees Cook <keescook@chromium.org>, LKML <linux-kernel@vger.kernel.org>,
        ismael Ripoll <iripoll@upv.es>, <x86@kernel.org>,
        <linux-arm-kernel@lists.infradead.org>,
        Linux MIPS Mailing List <linux-mips@linux-mips.org>,
        linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH] Fix offset2lib issue for x86*, ARM*, PowerPC and MIPS
Message-ID: <20150227102644.18a0ea5f@canb.auug.org.au>
In-Reply-To: <20150226143815.09386fe280c7bd8797048bb2@linux-foundation.org>
References: <54EB735F.5030207@upv.es>
	<CAGXu5j+SBRcj+BGyxEwUzgKsB2fdzNiPY37Q=JTsf=-QbGwoGA@mail.gmail.com>
	<20150223205436.15133mg1kpyojyik@webmail.upv.es>
	<20150224073906.GA16422@gmail.com>
	<20150226143815.09386fe280c7bd8797048bb2@linux-foundation.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/JZsPtul0qHP.DyqOMy=3Buf"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2758
Lines: 85

--Sig_/JZsPtul0qHP.DyqOMy=3Buf
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Andrew,

[Just resending to correct addresses - sorry for those who get a duplicate]

On Thu, 26 Feb 2015 14:38:15 -0800 Andrew Morton <akpm@linux-foundation.org=
> wrote:
>
> diff -puN fs/binfmt_elf.c~fix-offset2lib-issue-for-x86-arm-powerpc-and-mi=
ps-fix fs/binfmt_elf.c
> --- a/fs/binfmt_elf.c~fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-f=
ix
> +++ a/fs/binfmt_elf.c
> @@ -22,6 +22,7 @@
>  #include <linux/slab.h>
>  #include <linux/personality.h>
>  #include <linux/elfcore.h>
> +#include <linux/elf-randomization.h>
>  #include <linux/init.h>
>  #include <linux/highuid.h>
>  #include <linux/compiler.h>
> @@ -2300,6 +2301,26 @@ out:
> =20
>  #endif		/* CONFIG_ELF_CORE */
> =20
> +/* Not all architectures implement mmap_rnd() */
> +unsigned long __weak mmap_rnd(void)
> +{
> +}
> +
> +/*
> + * Not all architectures use randomize_et_dyn(), so use __weak to let the
> + * linker omit it from vmlinux
> + */
> +unsigned long __weak randomize_et_dyn(unsigned long base)
> +{
> +	unsigned long ret;
> +
> +	if ((current->personality & ADDR_NO_RANDOMIZE) ||
> +		!(current->flags & PF_RANDOMIZE))
> +		return base;
> +	ret =3D base + mmap_rnd();
> +	return max(ret, base);
> +}
> + =20

Didn't we have some trouble with some compilers when the weak function
(mmap_rnd) was defined and used in the same file i.e. the wrong one was
used?

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Sig_/JZsPtul0qHP.DyqOMy=3Buf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJU76u5AAoJEMDTa8Ir7ZwV3OYP/R3kSXgU9faFjJ0kYa9gM6J3
tATiGk7Jp3DBzaNnBaUFeNESWTAcX2ETWYkuBeYMZ7ktPllIC0GTZU4SiuDbXGHu
Y6fWYgc1nvhb3hJrgLu2srWMUmf9uEByRKUD7wzTbwjiPLBprsF//eTnfKGOTQGW
vIDxGlG992REN6bblat+o1RX6+OBhuo2LtY/AAIdAbQIi3u9EWumalOqbosNOUno
BAQgtf3cM/xkVsJdBzVrig4k5AQUOfyYEzqcmgeQPmBB+RMMSAKQVQK00VTsgqeL
g9KnWswQCYJY1982rccL9ROutS1PLpZuXaWyAfXS3jmYXoVgQPKRqcP9Rul1T5FG
mI6xfAXgjImzSIIU0vk0qwZB2SFSg6uXmqSyI5NW0sm3tCy0ghhSpq7Y83Z9+CKl
iqTAhSojSsu4NatMTfD/Hf7dCvHbjRpvEFOPQT5Ad0+mr7aM5TxAPNgWxb6Uh0UF
WVHKHbCVPwHa8YTVHT2CyryvsgfJF4xqV69TErIyDv2kxlmvpK4gz0pCkSK2SYcE
S6BLWNvUVyf84k9i+3iQ63TVhRhf53aE0nuS+u80NGoL2dRTHC/Miwsw/mbf0dWY
B/T8G+1RufgoZLwDm1KTgYlNylYQniRGxxSaAqDgYfmrnoQcMYb3ZRPgD7VveClu
AIWKqXUFcrv+GfmC5aVT
=nDKw
-----END PGP SIGNATURE-----

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