|
Message-ID: <20161019083110.GD6447@kroah.com> Date: Wed, 19 Oct 2016 10:31:10 +0200 From: Greg KH <greg@...ah.com> To: kernel-hardening@...ts.openwall.com Cc: Colin Vidal <colin@...dal.org>, AKASHI Takahiro <takahiro.akashi@...aro.org>, David Windsor <dave@...gbits.org>, Kees Cook <keescook@...omium.org>, Hans Liljestrand <ishkamiel@...il.com> Subject: Re: RE: [RFC 1/2] Reordering / guard definition on atomic_*_wrap function in order to avoid implicitly defined / redefined error on them, when CONFIG_HARDENED_ATOMIC is unset. On Wed, Oct 19, 2016 at 08:21:06AM +0000, Reshetova, Elena wrote: > Signed-off-by: Colin Vidal <colin@...dal.org> No changelog at all? > --- > include/asm-generic/atomic-long.h | 55 +++++++++++++++++++++------------------ > include/linux/atomic.h | 55 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 85 insertions(+), 25 deletions(-) > > diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h > index 790cb00..94d712b 100644 > --- a/include/asm-generic/atomic-long.h > +++ b/include/asm-generic/atomic-long.h > @@ -46,6 +46,30 @@ typedef atomic_t atomic_long_wrap_t; > > #endif > > +#ifndef CONFIG_HARDENED_ATOMIC > +#define atomic_read_wrap(v) atomic_read(v) #define atomic_set_wrap(v, > +i) atomic_set((v), (i)) #define atomic_add_wrap(i, v) atomic_add((i), > +(v)) #define atomic_add_unless_wrap(v, i, j) atomic_add_unless((v), > +(i), (j)) #define atomic_sub_wrap(i, v) atomic_sub((i), (v)) #define > +atomic_inc_wrap(v) atomic_inc(v) #define atomic_inc_and_test_wrap(v) > +atomic_inc_and_test(v) #ifndef atomic_inc_return_wrap #define > +atomic_inc_return_wrap(v) atomic_inc_return(v) #endif #ifndef > +atomic_add_return_wrap #define atomic_add_return_wrap(i, v) > +atomic_add_return((i), (v)) #endif #define atomic_dec_wrap(v) > +atomic_dec(v) #ifndef atomic_xchg_wrap #define atomic_xchg_wrap(v, i) > +atomic_xchg((v), (i)) #endif #define atomic_long_inc_wrap(v) > +atomic_long_inc(v) #define atomic_long_dec_wrap(v) atomic_long_dec(v) > +#define atomic_long_xchg_wrap(v, n) atomic_long_xchg(v, n) #define > +atomic_long_cmpxchg_wrap(l, o, n) atomic_long_cmpxchg(l, o, n) #endif > +/* CONFIG_HARDENED_ATOMIC */ That doesn't look correct to me at all, does it to you? thanks, greg k-h
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.