From nobody Thu May 2 03:22:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550590737736921.1281105195734; Tue, 19 Feb 2019 07:38:57 -0800 (PST) Received: from localhost ([127.0.0.1]:50625 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gw7Ts-0002Df-87 for importer@patchew.org; Tue, 19 Feb 2019 10:38:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gw7T2-0001wb-DY for qemu-devel@nongnu.org; Tue, 19 Feb 2019 10:37:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gw7Sq-0007QM-7u for qemu-devel@nongnu.org; Tue, 19 Feb 2019 10:37:48 -0500 Received: from mail-it1-x144.google.com ([2607:f8b0:4864:20::144]:32903) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gw7Sl-0007ON-DF for qemu-devel@nongnu.org; Tue, 19 Feb 2019 10:37:40 -0500 Received: by mail-it1-x144.google.com with SMTP id g137so3273326ita.0 for ; Tue, 19 Feb 2019 07:37:34 -0800 (PST) Received: from worksec.oberlin.net (ip-210-181.oberlin.net. [208.66.210.181]) by smtp.gmail.com with ESMTPSA id i14sm1457817itc.34.2019.02.19.07.37.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Feb 2019 07:37:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberlin-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=jZJNTbP6ggfah6uqNjEd5io+ikIWTiX9E6n0SDI7Eu0=; b=ZIJkNVKTJTZsOAc3X9xcCRWQqifsXg+ImaGpnnc0t16LZjiX4VyHg3hX61j/nn0rcC 4fwZ9xJzcJUzrwNF/8SDmBN2DKEhhI2bB1ckUtrhC9U6MUKdp6CzPMmMRoi2qDLJFTfS Y9NCEHyOs3jeP+lIDLc+ZctUf2UzDKKT239BovX239ghIb3tYTEEVeQLmE+lJnBE5Vx8 7VwflQjYDRDNTzmxm5JAGdJ40qEtnOwcfHHqym/QhcO8zOYl/XGouQ0cP2lPoq8jU6Ba pKS8eDO7ZafVI4fMi/COtpoxUQRBtZriYbppbjMbF3HTz1Xgee42MrwyNBxUi09FlrG7 jPoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jZJNTbP6ggfah6uqNjEd5io+ikIWTiX9E6n0SDI7Eu0=; b=qdabCWKNOVPAaLkrKeLZPcZJcLFm42/262vFm5BRAMc2F7hGUR7fYQP1sKe3a66Rsl BesekRzxKSHA1lP8QktahPmIdn9JI6uqL9Ki0LaSNOsncDeGcPu3iJbKzJaTTxDsFC21 Bzzfm2qbQ9yEwMzKLU/EpGcAHJCxXEoNQ+j1uemhYke++EqxLhEQulRL98/C8hxixnBB 1e64pV7EmYSsPjIhr0uSNtiJnnMR3AzSeXNrZi3XX0pkw7BhQeakJ237023a9Gl899d+ Iq0iKZLhEuGrxInK720lzhWRiPlJaQviuvPoPje2S0W82jLwQVWgtrHasIIcbzZniAR6 rhww== X-Gm-Message-State: AHQUAuZFHsJe2RpM+LactVfxF2nRhbCmg3mNxV7e6HxHGALDhVbxAxUE GVMIdLizMf2DhS5SC5QoFKPLicgYSTEuwQ== X-Google-Smtp-Source: AHgI3IYnCSOK1WVoXuvRFRb3D8oay9tcut8FIvPZmhyU0VP+hpQMvbnUsEJLa+5Nu11wvVVSFsqIlw== X-Received: by 2002:a6b:2c6:: with SMTP id 189mr16233033ioc.205.1550590653895; Tue, 19 Feb 2019 07:37:33 -0800 (PST) From: Stephen Checkoway To: qemu-devel@nongnu.org Date: Tue, 19 Feb 2019 10:37:27 -0500 Message-Id: <20190219153727.62279-1-stephen.checkoway@oberlin.edu> X-Mailer: git-send-email 2.17.2 (Apple Git-113) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::144 Subject: [Qemu-devel] [PATCH] block/pflash_cfi02: Fix memory leak and potential use-after-free 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: qemu-trivial@nongnu.org, Kevin Wolf , Stephen Checkoway , "open list:Block layer core" , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Don't dynamically allocate the pflash's timer. But do use timer_del in an unrealize function to make sure that the timer can't fire after the pflash_t has been freed. Signed-off-by: Stephen Checkoway Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Wei Yang --- hw/block/pflash_cfi02.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 0f8b7b8c7b..1588aeff5a 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -84,7 +84,7 @@ struct pflash_t { uint16_t unlock_addr0; uint16_t unlock_addr1; uint8_t cfi_table[0x52]; - QEMUTimer *timer; + QEMUTimer timer; /* The device replicates the flash memory across its memory space. Em= ulate * that by having a container (.mem) filled with an array of aliases * (.mem_mappings) pointing to the flash memory (.orig_mem). @@ -429,7 +429,7 @@ static void pflash_write (pflash_t *pfl, hwaddr offset, } pfl->status =3D 0x00; /* Let's wait 5 seconds before chip erase is done */ - timer_mod(pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + + timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (NANOSECONDS_PER_SECOND * 5)); break; case 0x30: @@ -444,7 +444,7 @@ static void pflash_write (pflash_t *pfl, hwaddr offset, } pfl->status =3D 0x00; /* Let's wait 1/2 second before sector erase is done */ - timer_mod(pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + + timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (NANOSECONDS_PER_SECOND / 2)); break; default: @@ -596,7 +596,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) pfl->rom_mode =3D 1; sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem); =20 - pfl->timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, pflash_timer, pfl); + timer_init_ns(&pfl->timer, QEMU_CLOCK_VIRTUAL, pflash_timer, pfl); pfl->wcycle =3D 0; pfl->cmd =3D 0; pfl->status =3D 0; @@ -695,11 +695,18 @@ static Property pflash_cfi02_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 +static void pflash_cfi02_unrealize(DeviceState *dev, Error **errp) +{ + pflash_t *pfl =3D CFI_PFLASH02(dev); + timer_del(&pfl->timer); +} + static void pflash_cfi02_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D pflash_cfi02_realize; + dc->unrealize =3D pflash_cfi02_unrealize; dc->props =3D pflash_cfi02_properties; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } --=20 2.17.2 (Apple Git-113)