diff mbox series

[U-Boot] rsa: check that pointer checksum isn't NULL before using it

Message ID 1552989340-23184-1-git-send-email-philippe.reynes@softathome.com
State Accepted
Commit b02f2e79c6272d97bf0bd191e6ec8e748a39ad58
Delegated to: Tom Rini
Headers show
Series [U-Boot] rsa: check that pointer checksum isn't NULL before using it | expand

Commit Message

Philippe REYNES March 19, 2019, 9:55 a.m. UTC
The pointer checksum were used before checking that it
isn't NULL. We move the code that use it after the check.

Reported-by: Coverity (CID: 185835)
Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
---
 lib/rsa/rsa-verify.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Simon Glass March 21, 2019, 5:22 a.m. UTC | #1
On Tue, 19 Mar 2019 at 17:55, Philippe Reynes
<philippe.reynes@softathome.com> wrote:
>
> The pointer checksum were used before checking that it
> isn't NULL. We move the code that use it after the check.
>
> Reported-by: Coverity (CID: 185835)
> Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
> ---
>  lib/rsa/rsa-verify.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
Tom Rini March 25, 2019, 9:28 p.m. UTC | #2
On Tue, Mar 19, 2019 at 10:55:40AM +0100, Philippe Reynes wrote:

> The pointer checksum were used before checking that it
> isn't NULL. We move the code that use it after the check.
> 
> Reported-by: Coverity (CID: 185835)
> Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index 9734f6d..287fcc4 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -295,7 +295,7 @@  static int rsa_verify_key(struct image_sign_info *info,
 #endif
 	struct checksum_algo *checksum = info->checksum;
 	struct padding_algo *padding = info->padding;
-	int hash_len = checksum->checksum_len;
+	int hash_len;
 
 	if (!prop || !sig || !hash || !checksum)
 		return -EIO;
@@ -315,6 +315,7 @@  static int rsa_verify_key(struct image_sign_info *info,
 	}
 
 	uint8_t buf[sig_len];
+	hash_len = checksum->checksum_len;
 
 #if !defined(USE_HOSTCC)
 	ret = uclass_get_device(UCLASS_MOD_EXP, 0, &mod_exp_dev);