[PATCH 0/2] dump: Fix issues flagged by Coverity

[PATCH 0/2] dump: Fix issues flagged by Coverity

[Markus Armbruster]

Markus Armbruster (2):
  dump: Plug file descriptor leak on non-seekable file
  dump: Fix HMP dump-guest-memory -z without -R

 dump/dump-hmp-cmds.c | 2 +-
 dump/dump.c          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
2.41.0

[PATCH 1/2] dump: Plug file descriptor leak on non-seekable file

[Markus Armbruster]

Fixes: e6549197f7ed (dump: Add command interface for kdump-raw formats)
Fixes: CID 1523842
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 dump/dump.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dump/dump.c b/dump/dump.c
index 1c304cadfd..ad5294e853 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -2160,6 +2160,7 @@ void qmp_dump_guest_memory(bool paging, const char *protocol,
         return;
     }
     if (kdump_raw && lseek(fd, 0, SEEK_CUR) == (off_t) -1) {
+        close(fd);
         error_setg(errp, "kdump-raw formats require a seekable file");
         return;
     }
-- 
2.41.0

[PATCH 2/2] dump: Fix HMP dump-guest-memory -z without -R

[Markus Armbruster]

-z without -R has no effect: the dump format remains @elf.  Fix the
logic error so it becomes @kdump-zlib.

Fixes: e6549197f7ed (dump: Add command interface for kdump-raw formats)
Fixes: CID 1523841
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 dump/dump-hmp-cmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dump/dump-hmp-cmds.c b/dump/dump-hmp-cmds.c
index b428ec33df..d9340427c3 100644
--- a/dump/dump-hmp-cmds.c
+++ b/dump/dump-hmp-cmds.c
@@ -41,7 +41,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict)
         dump_format = DUMP_GUEST_MEMORY_FORMAT_WIN_DMP;
     }
 
-    if (zlib && raw) {
+    if (zlib) {
         if (raw) {
             dump_format = DUMP_GUEST_MEMORY_FORMAT_KDUMP_RAW_ZLIB;
         } else {
-- 
2.41.0

Re: [PATCH 1/2] dump: Plug file descriptor leak on non-seekable file

[Marc-André Lureau]

Hi

On Wed, Nov 8, 2023 at 9:37 AM Markus Armbruster <armbru@redhat.com> wrote:
>
> Fixes: e6549197f7ed (dump: Add command interface for kdump-raw formats)
> Fixes: CID 1523842
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  dump/dump.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/dump/dump.c b/dump/dump.c
> index 1c304cadfd..ad5294e853 100644
> --- a/dump/dump.c
> +++ b/dump/dump.c
> @@ -2160,6 +2160,7 @@ void qmp_dump_guest_memory(bool paging, const char *protocol,
>          return;
>      }
>      if (kdump_raw && lseek(fd, 0, SEEK_CUR) == (off_t) -1) {
> +        close(fd);
>          error_setg(errp, "kdump-raw formats require a seekable file");
>          return;
>      }
> --

already queued for merge in:
[PULL 75/75] dump: Add close fd on error return to avoid resource leak

Re: [PATCH 0/2] dump: Fix issues flagged by Coverity

[Stephen Brennan]

Markus Armbruster <armbru@redhat.com> writes:
> Markus Armbruster (2):
>   dump: Plug file descriptor leak on non-seekable file
>   dump: Fix HMP dump-guest-memory -z without -R

Hi Markus,

I'm a bit late on the uptake here as these are already queued, but thank
you so much for finding and fixing my issues. Sorry for the extra work.

Reviewed-by: Stephen Brennan <stephen.s.brennan@oracle.com>

Re: [PATCH 2/2] dump: Fix HMP dump-guest-memory -z without -R

[Marc-André Lureau]

On Wed, Nov 8, 2023 at 9:38 AM Markus Armbruster <armbru@redhat.com> wrote:
>
> -z without -R has no effect: the dump format remains @elf.  Fix the
> logic error so it becomes @kdump-zlib.
>
> Fixes: e6549197f7ed (dump: Add command interface for kdump-raw formats)
> Fixes: CID 1523841
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

> ---
>  dump/dump-hmp-cmds.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dump/dump-hmp-cmds.c b/dump/dump-hmp-cmds.c
> index b428ec33df..d9340427c3 100644
> --- a/dump/dump-hmp-cmds.c
> +++ b/dump/dump-hmp-cmds.c
> @@ -41,7 +41,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict)
>          dump_format = DUMP_GUEST_MEMORY_FORMAT_WIN_DMP;
>      }
>
> -    if (zlib && raw) {
> +    if (zlib) {
>          if (raw) {
>              dump_format = DUMP_GUEST_MEMORY_FORMAT_KDUMP_RAW_ZLIB;
>          } else {
> --
> 2.41.0
>
>


-- 
Marc-André Lureau

Re: [PATCH 0/2] dump: Fix issues flagged by Coverity

[Markus Armbruster]

Stephen Brennan <stephen.s.brennan@oracle.com> writes:

> Markus Armbruster <armbru@redhat.com> writes:
>> Markus Armbruster (2):
>>   dump: Plug file descriptor leak on non-seekable file
>>   dump: Fix HMP dump-guest-memory -z without -R
>
> Hi Markus,
>
> I'm a bit late on the uptake here as these are already queued, but thank
> you so much for finding and fixing my issues. Sorry for the extra work.

Happens :)

> Reviewed-by: Stephen Brennan <stephen.s.brennan@oracle.com>

Thanks!