]> git.baikalelectronics.ru Git - uboot.git/commitdiff
lib: uuid: fix the test on RNG device presence
authorPatrick Delaunay <patrick.delaunay@foss.st.com>
Fri, 22 Oct 2021 15:05:47 +0000 (17:05 +0200)
committerTom Rini <trini@konsulko.com>
Tue, 26 Oct 2021 19:26:45 +0000 (15:26 -0400)
Correct the test on RNG device presence,when ret is equal to 0,
before to call dm_rng_read function.

Without this patch the RNG device is not used when present (when ret == 0)
or a data abort occurs in dm_rng_read when CONFIG_DM_RNG is activated but
the RNG device is not present in device tree (ret != 0 and devp = NULL).

Fixes: 674fc7fb5a66 ("lib: uuid: use RNG device if present")
CC: Matthias Brugger <mbrugger@suse.com>
CC: Torsten Duwe <duwe@suse.de>
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
lib/uuid.c

index 67267c66a3c30473abf050cd06f27e7f755bc704..e4703dce2b515d65ad709a2906353f3dd797330d 100644 (file)
@@ -257,7 +257,7 @@ void gen_rand_uuid(unsigned char *uuid_bin)
 
        if (IS_ENABLED(CONFIG_DM_RNG)) {
                ret = uclass_get_device(UCLASS_RNG, 0, &devp);
-               if (ret) {
+               if (!ret) {
                        ret = dm_rng_read(devp, &randv, sizeof(randv));
                        if (ret < 0)
                                randv = 0;