lkml.org 
[lkml]   [2020]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v11 11/11] x86/alternatives: Adapt assembly for PIE support
On Thu, Feb 27, 2020 at 04:00:56PM -0800, Thomas Garnier wrote:
> Change the assembly options to work with pointers instead of integers.
> The generated code is the same PIE just ensures input is a pointer.
>
> Signed-off-by: Thomas Garnier <thgarnie@chromium.org>

Reviewed-by: Kees Cook <keescook@chromium.org>

-Kees

> ---
> arch/x86/include/asm/alternative.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
> index 13adca37c99a..43a148042656 100644
> --- a/arch/x86/include/asm/alternative.h
> +++ b/arch/x86/include/asm/alternative.h
> @@ -243,7 +243,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
> /* Like alternative_io, but for replacing a direct call with another one. */
> #define alternative_call(oldfunc, newfunc, feature, output, input...) \
> asm_inline volatile (ALTERNATIVE("call %P[old]", "call %P[new]", feature) \
> - : output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input)
> + : output : [old] "X" (oldfunc), [new] "X" (newfunc), ## input)
>
> /*
> * Like alternative_call, but there are two features and respective functions.
> @@ -256,8 +256,8 @@ static inline int alternatives_text_reserved(void *start, void *end)
> asm_inline volatile (ALTERNATIVE_2("call %P[old]", "call %P[new1]", feature1,\
> "call %P[new2]", feature2) \
> : output, ASM_CALL_CONSTRAINT \
> - : [old] "i" (oldfunc), [new1] "i" (newfunc1), \
> - [new2] "i" (newfunc2), ## input)
> + : [old] "X" (oldfunc), [new1] "X" (newfunc1), \
> + [new2] "X" (newfunc2), ## input)
>
> /*
> * use this macro(s) if you need more than one output parameter
> --
> 2.25.1.481.gfbce0eb801-goog
>

--
Kees Cook

\
 
 \ /
  Last update: 2020-03-03 06:00    [W:0.101 / U:0.716 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site