On Wed, Oct 22, 2025 at 11:38:06AM +0200, Ahmad Fatoum wrote:
> FIT: fix use of multiple FIT keys
>
> streq_ptr returns true if both arguments are NULL. This can happen if we
> have no FIT key name hints at all and shouldn't lead to ignoring keys,
> so add the check for the hint.
key_name_hint can't be NULL, so this is not necessary. However, it's not
exactly obvious that key_name_hint can't be NULL, so this fixup improves
readability, hence: applied.
Sascha
> index 3017ccb5048f..22f768e7a070 100644
> --- a/common/image-fit.c
> +++ b/common/image-fit.c
> @@ -290,8 +290,8 @@ static int fit_check_signature(struct fit_handle *handle,
> struct device_node *si
> for_each_public_key(key) {
> fail_reason = "verification failed";
>
> - /* Don't recheck with same key as before */
> - if (streq_ptr(key->key_name_hint, key_name))
> + /* Don't recheck with same key_name as before */
> + if (key_name && streq_ptr(key->key_name_hint, key_name))
> continue;
>
> ret = public_key_verify(key, sig_value, sig_len, hash, algo);
> --
> 2.47.3
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
