SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

creds: fix leak of arg_tpm2_device

Browse Source 
IIUC, "auto" is the same as NULL. There is no need to strdup() anything.

Coverity CID#1458113.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2021-07-09 15:29:47 +02:00
parent 89fa9a6b7b
commit d1829af943
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/creds/creds.c
+4 -15
View File
@@ -704,30 +704,20 @@ static int parse_argv(int argc, char *argv[]) {
arg_with_key = CRED_AES256_GCM_BY_TPM2_HMAC;
break;
case ARG_TPM2_DEVICE: {
_cleanup_free_ char *device = NULL;
case ARG_TPM2_DEVICE:
if (streq(optarg, "list"))
return tpm2_list_devices();
if (!streq(optarg, "auto")) {
device = strdup(optarg);
if (!device)
return log_oom();
}
arg_tpm2_device = TAKE_PTR(device);
arg_tpm2_device = streq(optarg, "auto") ? NULL : optarg;
break;
}
case ARG_TPM2_PCRS: {
uint32_t mask;
case ARG_TPM2_PCRS:
if (isempty(optarg)) {
arg_tpm2_pcr_mask = 0;
break;
}
uint32_t mask;
r = tpm2_parse_pcrs(optarg, &mask);
if (r < 0)
return r;
@@ -738,7 +728,6 @@ static int parse_argv(int argc, char *argv[]) {
arg_tpm2_pcr_mask |= mask;
break;
}
case ARG_NAME:
if (isempty(optarg)) {