qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] dbb864: plugins: Fix resource leak in connect


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] dbb864: plugins: Fix resource leak in connect_socket()
Date: Mon, 16 Nov 2020 09:17:24 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: dbb864ba4f7bc419a3ce473aa9436cc41b2e3dfd
      
https://github.com/qemu/qemu/commit/dbb864ba4f7bc419a3ce473aa9436cc41b2e3dfd
  Author: Alex Chen <alex.chen@huawei.com>
  Date:   2020-11-16 (Mon, 16 Nov 2020)

  Changed paths:
    M contrib/plugins/lockstep.c

  Log Message:
  -----------
  plugins: Fix resource leak in connect_socket()

Close the fd when the connect() fails.

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Alex Chen <alex.chen@huawei.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20201109082829.87496-2-alex.chen@huawei.com>
Message-Id: <20201110192316.26397-2-alex.bennee@linaro.org>


  Commit: 9cd7dde0730ed823b545910c0d5a676142015e3b
      
https://github.com/qemu/qemu/commit/9cd7dde0730ed823b545910c0d5a676142015e3b
  Author: Alex Chen <alex.chen@huawei.com>
  Date:   2020-11-16 (Mon, 16 Nov 2020)

  Changed paths:
    M contrib/plugins/lockstep.c

  Log Message:
  -----------
  plugins: Fix two resource leaks in setup_socket()

Either accept() fails or exits normally, we need to close the fd.

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Alex Chen <alex.chen@huawei.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20201109082829.87496-3-alex.chen@huawei.com>
Message-Id: <20201110192316.26397-3-alex.bennee@linaro.org>


  Commit: 0c3e41d40828f78f182c6eb7d54624ce7b0c49f8
      
https://github.com/qemu/qemu/commit/0c3e41d40828f78f182c6eb7d54624ce7b0c49f8
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2020-11-16 (Mon, 16 Nov 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson.build: fix building of Xen support for aarch64

Xen is supported on ARM although weirdly using the i386-softmmu model.
Checking based on the host CPU meant we never enabled Xen support. It
would be nice to enable CONFIG_XEN for aarch64-softmmu to make it not
seem weird but that will require further build surgery.

Fixes: 8a19980e3f ("configure: move accelerator logic to meson")
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Masami Hiramatsu <masami.hiramatsu@linaro.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Paul Durrant <paul@xen.org>
Message-Id: <20201110192316.26397-4-alex.bennee@linaro.org>


  Commit: 97d351b476233ed8c80e61af79d6437fb3cef058
      
https://github.com/qemu/qemu/commit/97d351b476233ed8c80e61af79d6437fb3cef058
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2020-11-16 (Mon, 16 Nov 2020)

  Changed paths:
    M include/hw/xen/xen.h

  Log Message:
  -----------
  include/hw/xen.h: drop superfluous struct

Chardev is already a typedef'ed struct.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20201110192316.26397-5-alex.bennee@linaro.org>


  Commit: d67ef04cb8cb16012d6493ef879b7889c2e962f2
      
https://github.com/qemu/qemu/commit/d67ef04cb8cb16012d6493ef879b7889c2e962f2
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2020-11-16 (Mon, 16 Nov 2020)

  Changed paths:
    M stubs/xen-hw-stub.c

  Log Message:
  -----------
  stubs/xen-hw-stub: drop xenstore_store_pv_console_info stub

We should never build something that calls this without having it.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20201110192316.26397-6-alex.bennee@linaro.org>


  Commit: 4bdccdec70b27a474afd4711dddbbf5a56c2040a
      
https://github.com/qemu/qemu/commit/4bdccdec70b27a474afd4711dddbbf5a56c2040a
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2020-11-16 (Mon, 16 Nov 2020)

  Changed paths:
    M accel/stubs/hax-stub.c

  Log Message:
  -----------
  accel/stubs: drop unused cpu.h include

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20201110192316.26397-7-alex.bennee@linaro.org>


  Commit: 811c74fb657db0559274a710e50ef0096a1915a3
      
https://github.com/qemu/qemu/commit/811c74fb657db0559274a710e50ef0096a1915a3
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-11-16 (Mon, 16 Nov 2020)

  Changed paths:
    M hw/i386/acpi-build.c

  Log Message:
  -----------
  hw/i386/acpi-build: Fix maybe-uninitialized error when ACPI hotplug off

GCC 9.3.0 thinks that 'method' can be left uninitialized. This code
is already in the "if (bsel || pcihp_bridge_en)" block statement,
but it isn't smart enough to figure it out.

Restrict the code to be used only in the "if (bsel || pcihp_bridge_en)"
block statement to fix (on Ubuntu):

  ../hw/i386/acpi-build.c: In function 'build_append_pci_bus_devices':
  ../hw/i386/acpi-build.c:496:9: error: 'method' may be used uninitialized
  in this function [-Werror=maybe-uninitialized]
    496 |         aml_append(parent_scope, method);
        |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  cc1: all warnings being treated as errors

Fixes: df4008c9c59 ("piix4: don't reserve hw resources when hotplug is off 
globally")
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20201108204535.2319870-4-philmd@redhat.com>
Message-Id: <20201110192316.26397-8-alex.bennee@linaro.org>


  Commit: b48580ad92c43e6bdc381d467a9fb67869864a04
      
https://github.com/qemu/qemu/commit/b48580ad92c43e6bdc381d467a9fb67869864a04
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-11-16 (Mon, 16 Nov 2020)

  Changed paths:
    M tests/acceptance/boot_linux_console.py
    M tests/acceptance/replay_kernel.py

  Log Message:
  -----------
  tests/acceptance: Disable Spartan-3A DSP 1800A test

This test is regularly failing on CI:

   (05/34) 
tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_microblaze_s3adsp1800:
  Linux version 4.11.3 (thuth@thuth.remote.csb) (gcc version 6.4.0 (Buildroot 
2018.05.2) ) #5 Tue Dec 11 11:56:23 CET 2018
  ...
  Freeing unused kernel memory: 1444K
  This architecture does not have kernel memory protection.
  [nothing happens here]
  Runner error occurred: Timeout reached (90.91 s)

This is a regression. Until someone figure out the problem,
disable the test to keep CI pipeline useful.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201109091719.2449141-1-f4bug@amsat.org>
Message-Id: <20201110192316.26397-9-alex.bennee@linaro.org>


  Commit: 7025111a199b97ae806817788bec50f456c47d85
      
https://github.com/qemu/qemu/commit/7025111a199b97ae806817788bec50f456c47d85
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2020-11-16 (Mon, 16 Nov 2020)

  Changed paths:
    M .gitlab-ci.d/check-patch.py

  Log Message:
  -----------
  .gitlab-ci.d/check-patch: tweak output for CI logs

We don't need running commentary for the CI logs and by keeping it
short we might just see the problem on the first page. While we are at
it flush the previous line so order is maintained between script and
sub process.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20201113174404.19608-1-alex.bennee@linaro.org>


  Commit: f41ae328ba1519147c5083cb96137c86e8659c61
      
https://github.com/qemu/qemu/commit/f41ae328ba1519147c5083cb96137c86e8659c61
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-16 (Mon, 16 Nov 2020)

  Changed paths:
    M .gitlab-ci.d/check-patch.py
    M accel/stubs/hax-stub.c
    M contrib/plugins/lockstep.c
    M hw/i386/acpi-build.c
    M include/hw/xen/xen.h
    M meson.build
    M stubs/xen-hw-stub.c
    M tests/acceptance/boot_linux_console.py
    M tests/acceptance/replay_kernel.py

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/stsquad/tags/pull-testing-and-misc-161120-1' into staging

Various fixes

  - fix resource leak in a couple of plugin
  - fix build of Xen enabled i386 image on Aarch64
  - maybe unitialized warning fix
  - disable unstable Spartan-3A acceptance test
  - terser output of gitlab checkpatch check

# gpg: Signature made Mon 16 Nov 2020 11:11:05 GMT
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) 
<alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-and-misc-161120-1:
  .gitlab-ci.d/check-patch: tweak output for CI logs
  tests/acceptance: Disable Spartan-3A DSP 1800A test
  hw/i386/acpi-build: Fix maybe-uninitialized error when ACPI hotplug off
  accel/stubs: drop unused cpu.h include
  stubs/xen-hw-stub: drop xenstore_store_pv_console_info stub
  include/hw/xen.h: drop superfluous struct
  meson.build: fix building of Xen support for aarch64
  plugins: Fix two resource leaks in setup_socket()
  plugins: Fix resource leak in connect_socket()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/2f7c9dd51815...f41ae328ba15



reply via email to

[Prev in Thread] Current Thread [Next in Thread]