diff options
| -rw-r--r-- | utility/tpmc.c | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/utility/tpmc.c b/utility/tpmc.c index 587e99ff..2e1e5180 100644 --- a/utility/tpmc.c +++ b/utility/tpmc.c @@ -167,10 +167,14 @@ static uint32_t HandlerDeactivate(void) { static uint32_t HandlerDefineSpace(void) { uint32_t index, size, perm; - if (nargs != 5) { - fprintf(stderr, "usage: tpmc def <index> <size> <perm>\n"); + int overwrite = 1; + + if (nargs != 5 && nargs != 6) { + fprintf(stderr, "usage: tpmc def <index> <size> <perm> " + "[--no-overwrite])\n"); exit(OTHER_ERROR); } + if (HexStringToUint32(args[2], &index) != 0 || HexStringToUint32(args[3], &size) != 0 || HexStringToUint32(args[4], &perm) != 0) { @@ -178,6 +182,32 @@ static uint32_t HandlerDefineSpace(void) { "32-bit hex (0x[0-9a-f]+)\n"); exit(OTHER_ERROR); } + + if (args[5] && strcmp(args[5], "--no-overwrite") == 0) { + overwrite = 0; + } + +#ifdef TPM2_MODE + // For TPM 2.0, DefineSpace will fail if the space already exists, so to + // support the default 'overwrite' mode, need to undefine the space first. + if (overwrite) { + TlclUndefineSpace(index); + } +#else /* ifndef TPM2_MODE */ + // For TPM 1.2, we have to check the existing before calling DefineSpace(), + // since it will automaticly overwrite the existing space by default. + // Do nothing for TPM 2.0. We rely on DefineSpace() to return the appropriate + // error code. + if (!overwrite) { + uint32_t result , permissions; + result = TlclGetPermissions(index, &permissions); + if (!result) { + fprintf(stderr, "The space is existing but --no-overwrite is set.\n"); + exit(OTHER_ERROR); + } + } +#endif + return TlclDefineSpace(index, perm, size); } @@ -587,7 +617,10 @@ command_record command_table[] = { TPM_MODE_SELECT("set the bGlobalLock until reboot", "set rollback protection lock for R/W firmware until reboot"), TlclSetGlobalLock }, - { "definespace", "def", "define a space (def <index> <size> <perm>)", + { "definespace", "def", + TPM_MODE_SELECT("define a space (def <index> <size> <perm>). ", + "define a space (def <index> <size> <perm> [--no-overwrite]). ") + "Default will overwrite if the space is defined.", HandlerDefineSpace }, { "undefinespace", "undef", "undefine a space (undef <index>)" |