lkml.org 
[lkml]   [2020]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 4/6] random32: remove net_rand_state from the latent entropy gcc plugin
    Date
    From: Linus Torvalds <torvalds@linux-foundation.org>

    commit 83bdc7275e6206f560d247be856bceba3e1ed8f2 upstream.

    It turns out that the plugin right now ends up being really unhappy
    about the change from 'static' to 'extern' storage that happened in
    commit f227e3ec3b5c ("random32: update the net random state on interrupt
    and activity").

    This is probably a trivial fix for the latent_entropy plugin, but for
    now, just remove net_rand_state from the list of things the plugin
    worries about.

    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: Emese Revfy <re.emese@gmail.com>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: Willy Tarreau <w@1wt.eu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/linux/random.h | 2 +-
    lib/random32.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/include/linux/random.h
    +++ b/include/linux/random.h
    @@ -116,7 +116,7 @@ struct rnd_state {
    __u32 s1, s2, s3, s4;
    };

    -DECLARE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
    +DECLARE_PER_CPU(struct rnd_state, net_rand_state);

    u32 prandom_u32_state(struct rnd_state *state);
    void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
    --- a/lib/random32.c
    +++ b/lib/random32.c
    @@ -48,7 +48,7 @@ static inline void prandom_state_selftes
    }
    #endif

    -DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
    +DEFINE_PER_CPU(struct rnd_state, net_rand_state);

    /**
    * prandom_u32_state - seeded pseudo-random number generator.

    \
     
     \ /
      Last update: 2020-08-05 22:05    [W:4.580 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site