!6 Fix some memory leak in qemu
Merge pull request !6 from FangYing/memory-leak
This commit is contained in:
openeuler-ci-bot
Gitee
commit
01b6e5a64f
36
arm-translate-a64-fix-uninitialized-variable-warning.patch
Normal file
36
arm-translate-a64-fix-uninitialized-variable-warning.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
From b4bab3bf6a75d97d2f1098c4dc52d35ced003c70 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Pan Nengyuan <pannengyuan@huawei.com>
|
||||||
|
Date: Mon, 13 Jan 2020 17:01:11 +0800
|
||||||
|
Subject: [PATCH] arm/translate-a64: fix uninitialized variable warning
|
||||||
|
|
||||||
|
Fixes:
|
||||||
|
target/arm/translate-a64.c: In function 'disas_crypto_three_reg_sha512':
|
||||||
|
target/arm/translate-a64.c:13625:9: error: 'genfn' may be used uninitialized in this function [-Werror=maybe-uninitialized]
|
||||||
|
genfn(tcg_rd_ptr, tcg_rn_ptr, tcg_rm_ptr);
|
||||||
|
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
qemu/target/arm/translate-a64.c:13609:8: error: 'feature' may be used uninitialized in this function [-Werror=maybe-uninitialized]
|
||||||
|
if (!feature) {
|
||||||
|
|
||||||
|
Reported-by: Euler Robot <euler.robot@huawei.com>
|
||||||
|
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
|
||||||
|
---
|
||||||
|
target/arm/translate-a64.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
|
||||||
|
index dcdeb801..5f423d5d 100644
|
||||||
|
--- a/target/arm/translate-a64.c
|
||||||
|
+++ b/target/arm/translate-a64.c
|
||||||
|
@@ -13767,6 +13767,8 @@ static void disas_crypto_three_reg_sha512(DisasContext *s, uint32_t insn)
|
||||||
|
feature = dc_isar_feature(aa64_sha3, s);
|
||||||
|
genfn = NULL;
|
||||||
|
break;
|
||||||
|
+ default:
|
||||||
|
+ g_assert_not_reached();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
switch (opcode) {
|
||||||
|
--
|
||||||
|
2.18.1
|
||||||
|
|
||||||
|
|
||||||
46
nbd-fix-uninitialized-variable-warning.patch
Normal file
46
nbd-fix-uninitialized-variable-warning.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
From eb5abb631196b97879a868ec75e7f70400695f7f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Pan Nengyuan <pannengyuan@huawei.com>
|
||||||
|
Date: Mon, 13 Jan 2020 17:03:08 +0800
|
||||||
|
Subject: [PATCH] nbd: fix uninitialized variable warning
|
||||||
|
|
||||||
|
Fixes:
|
||||||
|
/mnt/sdb/qemu/nbd/server.c: In function 'nbd_handle_request':
|
||||||
|
/mnt/sdb/qemu/nbd/server.c:2313:9: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
Reported-by: Euler Robot <euler.robot@huawei.com>
|
||||||
|
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
|
||||||
|
---
|
||||||
|
nbd/server.c | 10 +---------
|
||||||
|
1 file changed, 1 insertion(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/nbd/server.c b/nbd/server.c
|
||||||
|
index e21bd501..aefb07d9 100644
|
||||||
|
--- a/nbd/server.c
|
||||||
|
+++ b/nbd/server.c
|
||||||
|
@@ -2304,20 +2304,12 @@ static coroutine_fn int nbd_handle_request(NBDClient *client,
|
||||||
|
!client->export_meta.bitmap,
|
||||||
|
NBD_META_ID_BASE_ALLOCATION,
|
||||||
|
errp);
|
||||||
|
- if (ret < 0) {
|
||||||
|
- return ret;
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (client->export_meta.bitmap) {
|
||||||
|
+ } else { /* client->export_meta.bitmap */
|
||||||
|
ret = nbd_co_send_bitmap(client, request->handle,
|
||||||
|
client->exp->export_bitmap,
|
||||||
|
request->from, request->len,
|
||||||
|
dont_fragment,
|
||||||
|
true, NBD_META_ID_DIRTY_BITMAP, errp);
|
||||||
|
- if (ret < 0) {
|
||||||
|
- return ret;
|
||||||
|
- }
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
--
|
||||||
|
2.18.1
|
||||||
|
|
||||||
|
|
||||||
@ -84,6 +84,10 @@ Patch0071: linux-headers-update-against-KVM-ARM-Fix-256-vcpus.patch
|
|||||||
Patch0072: intc-arm_gic-Support-IRQ-injection-for-more-than-256.patch
|
Patch0072: intc-arm_gic-Support-IRQ-injection-for-more-than-256.patch
|
||||||
Patch0073: ARM-KVM-Check-KVM_CAP_ARM_IRQ_LINE_LAYOUT_2-for-smp_.patch
|
Patch0073: ARM-KVM-Check-KVM_CAP_ARM_IRQ_LINE_LAYOUT_2-for-smp_.patch
|
||||||
Patch0074: 9pfs-local-Fix-possible-memory-leak-in-local_link.patch
|
Patch0074: 9pfs-local-Fix-possible-memory-leak-in-local_link.patch
|
||||||
|
Patch0075: scsi-disk-define-props-in-scsi_block_disk-to-avoid-memleaks.patch
|
||||||
|
Patch0076: arm-translate-a64-fix-uninitialized-variable-warning.patch
|
||||||
|
Patch0077: nbd-fix-uninitialized-variable-warning.patch
|
||||||
|
Patch0078: xhci-Fix-memory-leak-in-xhci_kick_epctx-when-poweroff.patch
|
||||||
|
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
@ -416,6 +420,10 @@ getent passwd qemu >/dev/null || \
|
|||||||
%changelog
|
%changelog
|
||||||
* Mon Jan 13 2020 Huawei Technologies Co., Ltd. <fangying1@huawei.com>
|
* Mon Jan 13 2020 Huawei Technologies Co., Ltd. <fangying1@huawei.com>
|
||||||
- 9pfs: Fix a possible memory leak in local_link
|
- 9pfs: Fix a possible memory leak in local_link
|
||||||
|
- scsi-disk: disk define props in scsi_block to avoid memleaks
|
||||||
|
- arm/translate-a64: fix uninitialized variable warning
|
||||||
|
- nbd: fix uninitialized variable warning
|
||||||
|
- xhci: Fix memory leak in xhci_kick_epctx when poweroff
|
||||||
|
|
||||||
* Mon Jan 6 2020 backport from qemu upstream
|
* Mon Jan 6 2020 backport from qemu upstream
|
||||||
- linux headers: update against "KVM/ARM: Fix >256 vcp
|
- linux headers: update against "KVM/ARM: Fix >256 vcp
|
||||||
|
|||||||
@ -0,0 +1,36 @@
|
|||||||
|
From 79da8e2e18610ae22a3bd640c117ba56b911038d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Pan Nengyuan <pannengyuan@huawei.com>
|
||||||
|
Date: Mon, 13 Jan 2020 15:53:32 +0800
|
||||||
|
Subject: [PATCH] scsi-disk: define props in scsi_block_disk to avoid
|
||||||
|
memleaks
|
||||||
|
|
||||||
|
scsi_block_realize() use scsi_realize() to init some props, but
|
||||||
|
these props is not defined in scsi_block_disk_properties, so they will
|
||||||
|
not be freed.
|
||||||
|
|
||||||
|
This patch defines these prop in scsi_block_disk_properties to avoid memleaks.
|
||||||
|
|
||||||
|
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
|
||||||
|
---
|
||||||
|
hw/scsi/scsi-disk.c | 4 +---
|
||||||
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
|
||||||
|
index e7e865ab..233afb4a 100644
|
||||||
|
--- a/hw/scsi/scsi-disk.c
|
||||||
|
+++ b/hw/scsi/scsi-disk.c
|
||||||
|
@@ -3026,9 +3026,7 @@ static const TypeInfo scsi_cd_info = {
|
||||||
|
|
||||||
|
#ifdef __linux__
|
||||||
|
static Property scsi_block_properties[] = {
|
||||||
|
- DEFINE_BLOCK_ERROR_PROPERTIES(SCSIDiskState, qdev.conf), \
|
||||||
|
- DEFINE_PROP_DRIVE("drive", SCSIDiskState, qdev.conf.blk),
|
||||||
|
- DEFINE_PROP_BOOL("share-rw", SCSIDiskState, qdev.conf.share_rw, false),
|
||||||
|
+ DEFINE_SCSI_DISK_PROPERTIES(),
|
||||||
|
DEFINE_PROP_UINT16("rotation_rate", SCSIDiskState, rotation_rate, 0),
|
||||||
|
DEFINE_PROP_UINT64("max_unmap_size", SCSIDiskState, max_unmap_size,
|
||||||
|
DEFAULT_MAX_UNMAP_SIZE),
|
||||||
|
--
|
||||||
|
2.18.1
|
||||||
|
|
||||||
|
|
||||||
56
xhci-Fix-memory-leak-in-xhci_kick_epctx-when-poweroff.patch
Normal file
56
xhci-Fix-memory-leak-in-xhci_kick_epctx-when-poweroff.patch
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
From cf859d444770243fa184019fd4eab135b2653390 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Chen Qun <kuhn.chenqun@huawei.com>
|
||||||
|
Date: Fri, 10 Jan 2020 18:36:24 +0800
|
||||||
|
Subject: [PATCH] xhci: Fix memory leak in xhci_kick_epctx when poweroff
|
||||||
|
GuestOS
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
start vm with libvirt, when GuestOS running, enter poweroff command using
|
||||||
|
the xhci keyboard, then ASAN shows memory leak stack：
|
||||||
|
|
||||||
|
Direct leak of 80 byte(s) in 5 object(s) allocated from:
|
||||||
|
#0 0xfffd1e6431cb in __interceptor_malloc (/lib64/libasan.so.4+0xd31cb)
|
||||||
|
#1 0xfffd1e107163 in g_malloc (/lib64/libglib-2.0.so.0+0x57163)
|
||||||
|
#2 0xaaad39051367 in qemu_sglist_init /qemu/dma-helpers.c:43
|
||||||
|
#3 0xaaad3947c407 in pci_dma_sglist_init /qemu/include/hw/pci/pci.h:842
|
||||||
|
#4 0xaaad3947c407 in xhci_xfer_create_sgl /qemu/hw/usb/hcd-xhci.c:1446
|
||||||
|
#5 0xaaad3947c407 in xhci_setup_packet /qemu/hw/usb/hcd-xhci.c:1618
|
||||||
|
#6 0xaaad3948625f in xhci_submit /qemu/hw/usb/hcd-xhci.c:1827
|
||||||
|
#7 0xaaad3948625f in xhci_fire_transfer /qemu/hw/usb/hcd-xhci.c:1839
|
||||||
|
#8 0xaaad3948625f in xhci_kick_epctx /qemu/hw/usb/hcd-xhci.c:1991
|
||||||
|
#9 0xaaad3948f537 in xhci_doorbell_write /qemu/hw/usb/hcd-xhci.c:3158
|
||||||
|
#10 0xaaad38bcbfc7 in memory_region_write_accessor /qemu/memory.c:483
|
||||||
|
#11 0xaaad38bc654f in access_with_adjusted_size /qemu/memory.c:544
|
||||||
|
#12 0xaaad38bd1877 in memory_region_dispatch_write /qemu/memory.c:1482
|
||||||
|
#13 0xaaad38b1c77f in flatview_write_continue /qemu/exec.c:3167
|
||||||
|
#14 0xaaad38b1ca83 in flatview_write /qemu/exec.c:3207
|
||||||
|
#15 0xaaad38b268db in address_space_write /qemu/exec.c:3297
|
||||||
|
#16 0xaaad38bf909b in kvm_cpu_exec /qemu/accel/kvm/kvm-all.c:2383
|
||||||
|
#17 0xaaad38bb063f in qemu_kvm_cpu_thread_fn /qemu/cpus.c:1246
|
||||||
|
#18 0xaaad39821c93 in qemu_thread_start /qemu/util/qemu-thread-posix.c:519
|
||||||
|
#19 0xfffd1c8378bb (/lib64/libpthread.so.0+0x78bb)
|
||||||
|
#20 0xfffd1c77616b (/lib64/libc.so.6+0xd616b)
|
||||||
|
|
||||||
|
Reported-by: Euler Robot <euler.robot@huawei.com>
|
||||||
|
Signed-off-by: Chen Qun <kuhn.chenqun@h
|
||||||
|
---
|
||||||
|
hw/usb/hcd-xhci.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
|
||||||
|
index 80988bb305..0d3d96d05a 100644
|
||||||
|
--- a/hw/usb/hcd-xhci.c
|
||||||
|
+++ b/hw/usb/hcd-xhci.c
|
||||||
|
@@ -2000,6 +2000,7 @@ static void xhci_kick_epctx(XHCIEPContext *epctx, unsigned int streamid)
|
||||||
|
if (xfer != NULL && xfer->running_retry) {
|
||||||
|
DPRINTF("xhci: xfer nacked, stopping schedule\n");
|
||||||
|
epctx->retry = xfer;
|
||||||
|
+ xhci_xfer_unmap(xfer);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (count++ > TRANSFER_LIMIT) {
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user