random: do not sign extend bytes for rotation when mixing
authorJason A. Donenfeld <Jason@zx2c4.com>
Fri, 24 Dec 2021 18:17:58 +0000 (19:17 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 May 2022 07:29:00 +0000 (09:29 +0200)
commit 0d9488ffbf2faddebc6bac055bfa6c93b94056a3 upstream.

By using `char` instead of `unsigned char`, certain platforms will sign
extend the byte when `w = rol32(*bytes++, input_rotate)` is called,
meaning that bit 7 is overrepresented when mixing. This isn't a real
problem (unless the mixer itself is already broken) since it's still
invertible, but it's not quite correct either. Fix this by using an
explicit unsigned type.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/char/random.c

index ca773f1..8eac765 100644 (file)
@@ -547,7 +547,7 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
        unsigned long i, tap1, tap2, tap3, tap4, tap5;
        int input_rotate;
        int wordmask = r->poolinfo->poolwords - 1;
-       const char *bytes = in;
+       const unsigned char *bytes = in;
        __u32 w;
 
        tap1 = r->poolinfo->tap1;