powerpc/archrandom: fix arch_get_random_seed_int()
authorArd Biesheuvel <ardb@kernel.org>
Wed, 4 Dec 2019 11:50:15 +0000 (11:50 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 26 Jan 2020 09:01:00 +0000 (10:01 +0100)
commit b6afd1234cf93aa0d71b4be4788c47534905f0be upstream.

Commit 01c9348c7620ec65

  powerpc: Use hardware RNG for arch_get_random_seed_* not arch_get_random_*

updated arch_get_random_[int|long]() to be NOPs, and moved the hardware
RNG backing to arch_get_random_seed_[int|long]() instead. However, it
failed to take into account that arch_get_random_int() was implemented
in terms of arch_get_random_long(), and so we ended up with a version
of the former that is essentially a NOP as well.

Fix this by calling arch_get_random_seed_long() from
arch_get_random_seed_int() instead.

Fixes: 01c9348c7620ec65 ("powerpc: Use hardware RNG for arch_get_random_seed_* not arch_get_random_*")
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191204115015.18015-1-ardb@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/include/asm/archrandom.h

index 9c63b59..a09595f 100644 (file)
@@ -28,7 +28,7 @@ static inline int arch_get_random_seed_int(unsigned int *v)
        unsigned long val;
        int rc;
 
-       rc = arch_get_random_long(&val);
+       rc = arch_get_random_seed_long(&val);
        if (rc)
                *v = val;