lkml.org 
[lkml]   [2014]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] x86, kaslr: add missed "static" declarations
From
On Sun, Feb 9, 2014 at 1:56 PM, Kees Cook <keescook@chromium.org> wrote:
> This silences build warnings about unexported variables and functions.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> arch/x86/boot/compressed/aslr.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c
> index 90a21f430117..4dbf967da50d 100644
> --- a/arch/x86/boot/compressed/aslr.c
> +++ b/arch/x86/boot/compressed/aslr.c
> @@ -111,7 +111,7 @@ struct mem_vector {
> };
>
> #define MEM_AVOID_MAX 5
> -struct mem_vector mem_avoid[MEM_AVOID_MAX];
> +static struct mem_vector mem_avoid[MEM_AVOID_MAX];
>
> static bool mem_contains(struct mem_vector *region, struct mem_vector *item)
> {
> @@ -180,7 +180,7 @@ static void mem_avoid_init(unsigned long input, unsigned long input_size,
> }
>
> /* Does this memory vector overlap a known avoided area? */
> -bool mem_avoid_overlap(struct mem_vector *img)
> +static bool mem_avoid_overlap(struct mem_vector *img)
> {
> int i;
>
> @@ -192,8 +192,9 @@ bool mem_avoid_overlap(struct mem_vector *img)
> return false;
> }
>
> -unsigned long slots[CONFIG_RANDOMIZE_BASE_MAX_OFFSET / CONFIG_PHYSICAL_ALIGN];
> -unsigned long slot_max = 0;
> +static unsigned long slots[CONFIG_RANDOMIZE_BASE_MAX_OFFSET /
> + CONFIG_PHYSICAL_ALIGN];
> +static unsigned long slot_max;
>
> static void slots_append(unsigned long addr)
> {
> --
> 1.7.9.5
>
>
> --
> Kees Cook
> Chrome OS Security

Ping on this patch; simple build warning fixes...

-Kees

--
Kees Cook
Chrome OS Security


\
 
 \ /
  Last update: 2014-02-21 22:21    [W:0.133 / U:0.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site