Merge tag 'tpm-next-01072025' of https://source.denx.de/u-boot/custodians/u-boot-tpm into next
CI: https://source.denx.de/u-boot/custodians/u-boot-tpm/-/pipelines/26897 Updates from Andrew fixing issues reported by smatch. It picked up cases of enum functions returning integers instead of enum values.
This commit is contained in:
+3
-3
@@ -113,7 +113,7 @@ static int do_tpm2_pcr_extend(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||
return CMD_RET_USAGE;
|
||||
if (argc == 4) {
|
||||
algo = tpm2_name_to_algorithm(argv[3]);
|
||||
if (algo < 0)
|
||||
if (algo == TPM2_ALG_INVAL)
|
||||
return CMD_RET_FAILURE;
|
||||
}
|
||||
algo_len = tpm2_algorithm_to_len(algo);
|
||||
@@ -157,7 +157,7 @@ static int do_tpm_pcr_read(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||
return CMD_RET_USAGE;
|
||||
if (argc == 4) {
|
||||
algo = tpm2_name_to_algorithm(argv[3]);
|
||||
if (algo < 0)
|
||||
if (algo == TPM2_ALG_INVAL)
|
||||
return CMD_RET_FAILURE;
|
||||
}
|
||||
algo_len = tpm2_algorithm_to_len(algo);
|
||||
@@ -288,7 +288,7 @@ static int do_tpm2_pcrallocate(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||
return CMD_RET_USAGE;
|
||||
|
||||
algo = tpm2_name_to_algorithm(argv[1]);
|
||||
if (algo == -EINVAL)
|
||||
if (algo == TPM2_ALG_INVAL)
|
||||
return CMD_RET_USAGE;
|
||||
|
||||
ret = get_tpm(&dev);
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
#define __TPM_V2_H
|
||||
|
||||
#include <tpm-common.h>
|
||||
#include <linux/errno.h>
|
||||
|
||||
struct udevice;
|
||||
|
||||
@@ -266,6 +267,7 @@ enum tpm2_return_codes {
|
||||
* TPM2 algorithms.
|
||||
*/
|
||||
enum tpm2_algorithms {
|
||||
TPM2_ALG_INVAL = -EINVAL,
|
||||
TPM2_ALG_SHA1 = 0x04,
|
||||
TPM2_ALG_XOR = 0x0A,
|
||||
TPM2_ALG_SHA256 = 0x0B,
|
||||
|
||||
+1
-1
@@ -1141,7 +1141,7 @@ enum tpm2_algorithms tpm2_name_to_algorithm(const char *name)
|
||||
}
|
||||
printf("%s: unsupported algorithm %s\n", __func__, name);
|
||||
|
||||
return -EINVAL;
|
||||
return TPM2_ALG_INVAL;
|
||||
}
|
||||
|
||||
const char *tpm2_algorithm_name(enum tpm2_algorithms algo)
|
||||
|
||||
Reference in New Issue
Block a user