diff options
| author | Tom Rini <[email protected]> | 2021-10-26 18:34:55 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-10-26 18:34:55 -0400 |
| commit | c9661d0fee0fa57b2ae2442829ed4e6b014c6296 (patch) | |
| tree | b088ee2d5955e72327db9660fdfcce1898aafc7d /lib | |
| parent | 75e33b378b3c81f1be1a8fa3815390b39fddda57 (diff) | |
| parent | 28ab12ad145d92de13baf679c8e3733be99ee95e (diff) | |
Merge branch '2021-10-26-add-nand-biterr-and-bugfixes'
- Add biterr sub-command to "nand"
- scmi, rsa, uuid bugfixes, re-sort DFU menu in Kconfig and remove
superfluous checks before free in env.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rsa/rsa-verify.c | 2 | ||||
| -rw-r--r-- | lib/uuid.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c index 600c93ab810..83f7564101c 100644 --- a/lib/rsa/rsa-verify.c +++ b/lib/rsa/rsa-verify.c @@ -340,7 +340,7 @@ static int rsa_verify_key(struct image_sign_info *info, struct padding_algo *padding = info->padding; int hash_len; - if (!prop || !sig || !hash || !checksum) + if (!prop || !sig || !hash || !checksum || !padding) return -EIO; if (sig_len != (prop->num_bits / 8)) { diff --git a/lib/uuid.c b/lib/uuid.c index 67267c66a3c..e4703dce2b5 100644 --- a/lib/uuid.c +++ b/lib/uuid.c @@ -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; |