[PATCH] arm64: Fix Kconfig dependencies for RANDOMIZE_BASE

[Catalin Marinas]

On Tue, Jul 26, 2016 at 06:45:56PM +0100, Catalin Marinas wrote:
> On Tue, Jul 26, 2016 at 10:16:55AM -0700, Jeff Vander Stoep wrote:
> > Selecting CONFIG_RANDOMIZE_BASE=y and CONFIG_MODULES=n causes a
> > build error due to dependencies on modules. This patch makes KASLR
> > module config options dependent on CONFIG_MODULES=y.
> > 
> > Signed-off-by: Jeff Vander Stoep <jeffv at google.com>
> > ---
> >  arch/arm64/Kconfig | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> > index 7e23f95..c9eff79 100644
> > --- a/arch/arm64/Kconfig
> > +++ b/arch/arm64/Kconfig
> > @@ -891,7 +891,6 @@ config RELOCATABLE
> >  
> >  config RANDOMIZE_BASE
> >  	bool "Randomize the address of the kernel image"
> > -	select ARM64_MODULE_PLTS
> >  	select RELOCATABLE
> >  	help
> >  	  Randomizes the virtual address at which the kernel image is
> 
> I thought we need the module PLTs once we randomize the kernel base,
> independent of whether we randomize the modules base or not.

Looking at the code, I think we don't really need the PLTs when the
modules are randomised together with the kernel image. So I think your
original patch is fine.

> Fixes: f80fb3a3d508 ("arm64: add support for kernel ASLR")
> Cc: <stable at vger.kernel.org> # 4.6+

I'll add these myself. Unless Ard has any objections, I'll queue this
for 4.8.

Thanks.

-- 
Catalin