[PATCH v2 1/1] lib: rsa: fix padding_pss_verify

[PATCH v2 1/1] lib: rsa: fix padding_pss_verify

[Heinrich Schuchardt]

Check the that the hash length is shorter than the message length. This
avoids:

    ./tools/../lib/rsa/rsa-verify.c:275:11: warning:
    ‘*db’ may be used uninitialized [-Wmaybe-uninitialized]
      275 |         db[0] &= 0xff >> leftmost_bits;

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
v2:
	Use -EINVAL to indicate incorrect parameters.
	Add description of return value.
---
 lib/rsa/rsa-verify.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index 1d95cfbdee..f13cd23cf2 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -215,6 +215,8 @@ out:
  * @msg_len:	Message length
  * @hash:	Pointer to the expected hash
  * @hash_len:	Length of the hash
+ *
+ * Return:	0 if padding is correct, non-zero otherwise
  */
 int padding_pss_verify(struct image_sign_info *info,
 		       const uint8_t *msg, int msg_len,
@@ -234,6 +236,9 @@ int padding_pss_verify(struct image_sign_info *info,
 	uint8_t leftmost_mask;
 	struct checksum_algo *checksum = info->checksum;
 
+	if (db_len <= 0)
+		return -EINVAL;
+
 	/* first, allocate everything */
 	db_mask = malloc(db_len);
 	db = malloc(db_len);
-- 
2.37.2

Re: [PATCH v2 1/1] lib: rsa: fix padding_pss_verify

[Simon Glass]

On Wed, 31 Aug 2022 at 13:13, Heinrich Schuchardt
<heinrich.schuchardt@canonical.com> wrote:
>
> Check the that the hash length is shorter than the message length. This
> avoids:
>
>     ./tools/../lib/rsa/rsa-verify.c:275:11: warning:
>     ‘*db’ may be used uninitialized [-Wmaybe-uninitialized]
>       275 |         db[0] &= 0xff >> leftmost_bits;
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> ---
> v2:
>         Use -EINVAL to indicate incorrect parameters.
>         Add description of return value.
> ---
>  lib/rsa/rsa-verify.c | 5 +++++
>  1 file changed, 5 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH v2 1/1] lib: rsa: fix padding_pss_verify

[Tom Rini]

On Wed, 31 Aug 2022 21:13:40 +0200, Heinrich Schuchardt wrote:

> Check the that the hash length is shorter than the message length. This
> avoids:
> 
>     ./tools/../lib/rsa/rsa-verify.c:275:11: warning:
>     ‘*db’ may be used uninitialized [-Wmaybe-uninitialized]
>       275 |         db[0] &= 0xff >> leftmost_bits;
> 
> [...]

As there were two patches, I took this one as it updated the kernel-doc comment
as well, and I put the fixes tag from Joel's commit here.

Applied to u-boot/next, thanks!

-- 
Tom