From nobody Wed Nov 5 14:26:06 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534871693868214.3378614906618; Tue, 21 Aug 2018 10:14:53 -0700 (PDT) Received: from localhost ([::1]:54995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsAF2-0003TV-Ki for importer@patchew.org; Tue, 21 Aug 2018 13:14:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsA3x-0001Aw-Bi for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsA3o-0005gk-GM for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:20 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39541) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fsA3n-0005X4-EU for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:15 -0400 Received: by mail-wr1-x42b.google.com with SMTP id o37-v6so7596407wrf.6 for ; Tue, 21 Aug 2018 10:03:13 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.03.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:03:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YznMZC5Zwyg7SERydhdKXsDUZE5zkw9EUk4DrI3SHNg=; b=V0DuQMphxnqxdtWGieNBeZwVbN/EmKC4WvSapVtDKg433ZJYG40iXU6C3rJhNNq5Rh v7RHNU3tNyPNbyPYUMBRbDkH/vNsHfKbqLfyAlQ0YwDhUNZsVRYgE/lJPTyJjCT43dvz 4rwCdMm3GYS12p70CB0zKaBMunhIUNgCIEQO1i5V0o1n2BJXSxkOSIPcZuJu8cmRw+zK +uROx92CQTl8PtyM+w5ZBziA2IaznklA7wxRd2wvRWn0I5DGfILYXM1mhCW2p63m4Exz wnqOJlf7pCuAOmpSsTpJKT4SIfKNLOAKas20WtVYy+0hDWnEYoQX+2+HpwzxqTOnUDsx ahFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=YznMZC5Zwyg7SERydhdKXsDUZE5zkw9EUk4DrI3SHNg=; b=BB7aMz05U4okdMQYQmuhY1oybE3fQXpQCUiUIN/eTZzF53Qg5UGfb55XMYE7TPGuHk RU567rLAab3hT3mDbYuupY5ZNpq+ZFQRZeJEIpTehSO9kA3F8J41BvNHqjLMd1LzNkSj 8ITyLalqa/Pes7SKLBb5aCpzcOEi9G0V50siURqcS3mcAfCl6UDGBMYp56P341DaM2gH AMPHUfNjj2WL7w+CybAmmUBCDbLIlYhkGKjWMFrVwSvwePagD0SSJX9z/sI85pyCZmeA 7/BOSSEhN4PDu2Tsz/02Kbo2ljiMbZC8gA1QlqTkQ1Gp0ZwIDiT5cWeSnfSpeACvOFAS piig== X-Gm-Message-State: APzg51CNUQqu16i6I3Hvog3eVfk7ILGrUvEu+nrZLub2LTtpCJ9mR21a HEUq8czL7wylLNEoQOB/vx8p1Roq X-Google-Smtp-Source: ANB0Vdb1irJ+qpOBVsgWDaZuYv3hjb3n5d4Cz5QlAzWzHjqMvDWe2psbzDW5TlQChEZEOTzsKKtsjg== X-Received: by 2002:adf:f24e:: with SMTP id b14-v6mr4554024wrp.184.1534870992187; Tue, 21 Aug 2018 10:03:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:01:40 +0200 Message-Id: <1534870966-9287-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL 08/74] megasas: fix sglist leak X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_6 Z_629925259 SPT_0 From: Marc-Andr=C3=A9 Lureau tests/cdrom-test -p /x86_64/cdrom/boot/megasas Produces the following ASAN leak. =3D=3D25700=3D=3DERROR: LeakSanitizer: detected memory leaks Direct leak of 16 byte(s) in 1 object(s) allocated from: #0 0x7f06f8faac48 in malloc (/lib64/libasan.so.5+0xeec48) #1 0x7f06f87a73c5 in g_malloc (/lib64/libglib-2.0.so.0+0x523c5) #2 0x55a729f17738 in pci_dma_sglist_init /home/elmarco/src/qq/include/h= w/pci/pci.h:818 #3 0x55a729f2a706 in megasas_map_dcmd /home/elmarco/src/qq/hw/scsi/mega= sas.c:698 #4 0x55a729f39421 in megasas_handle_dcmd /home/elmarco/src/qq/hw/scsi/m= egasas.c:1574 #5 0x55a729f3f70d in megasas_handle_frame /home/elmarco/src/qq/hw/scsi/= megasas.c:1955 #6 0x55a729f40939 in megasas_mmio_write /home/elmarco/src/qq/hw/scsi/me= gasas.c:2119 #7 0x55a729f41102 in megasas_port_write /home/elmarco/src/qq/hw/scsi/me= gasas.c:2170 #8 0x55a729220e60 in memory_region_write_accessor /home/elmarco/src/qq/= memory.c:527 #9 0x55a7292212b3 in access_with_adjusted_size /home/elmarco/src/qq/mem= ory.c:594 #10 0x55a72922cf70 in memory_region_dispatch_write /home/elmarco/src/qq= /memory.c:1473 #11 0x55a7290f5907 in flatview_write_continue /home/elmarco/src/qq/exec= .c:3255 #12 0x55a7290f5ceb in flatview_write /home/elmarco/src/qq/exec.c:3294 #13 0x55a7290f6457 in address_space_write /home/elmarco/src/qq/exec.c:3= 384 #14 0x55a7290f64a8 in address_space_rw /home/elmarco/src/qq/exec.c:3395 #15 0x55a72929ecb0 in kvm_handle_io /home/elmarco/src/qq/accel/kvm/kvm-= all.c:1729 #16 0x55a7292a0db5 in kvm_cpu_exec /home/elmarco/src/qq/accel/kvm/kvm-a= ll.c:1969 #17 0x55a7291c4212 in qemu_kvm_cpu_thread_fn /home/elmarco/src/qq/cpus.= c:1215 #18 0x55a72a966a6c in qemu_thread_start /home/elmarco/src/qq/util/qemu-= thread-posix.c:504 #19 0x7f06ed486593 in start_thread (/lib64/libpthread.so.0+0x7593) Move the qemu_sglist_destroy() from megasas_complete_command() to megasas_unmap_frame(), so map/unmap are balanced. Signed-off-by: Marc-Andr=C3=83=C2=A9 Lureau Message-Id: <20180814141247.32336-1-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/scsi/megasas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index ba1afa3..a56317e 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -464,6 +464,7 @@ static void megasas_unmap_frame(MegasasState *s, Megasa= sCmd *cmd) cmd->frame =3D NULL; cmd->pa =3D 0; cmd->pa_size =3D 0; + qemu_sglist_destroy(&cmd->qsg); clear_bit(cmd->index, s->frame_map); } =20 @@ -580,7 +581,6 @@ static void megasas_complete_frame(MegasasState *s, uin= t64_t context) =20 static void megasas_complete_command(MegasasCmd *cmd) { - qemu_sglist_destroy(&cmd->qsg); cmd->iov_size =3D 0; cmd->iov_offset =3D 0; =20 --=20 1.8.3.1