[Qemu-devel] [PATCH 28/42] tpm-passthrough: don't save guessed cancel_path in options

Marc-André Lureau posted 42 patches 8 years, 4 months ago
[Qemu-devel] [PATCH 28/42] tpm-passthrough: don't save guessed cancel_path in options
Posted by Marc-André Lureau 8 years, 4 months ago
The value is later unneeded, and may leak if the free visitor doesn't
consider it since has_cancel_path is false. And for consistency with
"path" it shouldn't be returned in get_tpm_options().

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 hw/tpm/tpm_passthrough.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index 8c002e4da6..048edb1a1a 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -226,9 +226,7 @@ static int tpm_passthrough_open_sysfs_cancel(TPMPassthruState *tpm_pt)
         if (snprintf(path, sizeof(path), "/sys/class/misc/%s/device/cancel",
                      dev) < sizeof(path)) {
             fd = qemu_open(path, O_WRONLY);
-            if (fd >= 0) {
-                tpm_pt->options->cancel_path = g_strdup(path);
-            } else {
+            if (fd < 0) {
                 error_report("tpm_passthrough: Could not open TPM cancel "
                              "path %s : %s", path, strerror(errno));
             }
-- 
2.14.1.146.gd35faa819


Re: [Qemu-devel] [PATCH 28/42] tpm-passthrough: don't save guessed cancel_path in options
Posted by Stefan Berger 8 years, 4 months ago
On 10/09/2017 06:56 PM, Marc-André Lureau wrote:
> The value is later unneeded, and may leak if the free visitor doesn't
> consider it since has_cancel_path is false. And for consistency with
> "path" it shouldn't be returned in get_tpm_options().
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


> ---
>   hw/tpm/tpm_passthrough.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
> index 8c002e4da6..048edb1a1a 100644
> --- a/hw/tpm/tpm_passthrough.c
> +++ b/hw/tpm/tpm_passthrough.c
> @@ -226,9 +226,7 @@ static int tpm_passthrough_open_sysfs_cancel(TPMPassthruState *tpm_pt)
>           if (snprintf(path, sizeof(path), "/sys/class/misc/%s/device/cancel",
>                        dev) < sizeof(path)) {
>               fd = qemu_open(path, O_WRONLY);
> -            if (fd >= 0) {
> -                tpm_pt->options->cancel_path = g_strdup(path);
> -            } else {
> +            if (fd < 0) {
>                   error_report("tpm_passthrough: Could not open TPM cancel "
>                                "path %s : %s", path, strerror(errno));
>               }