From nobody Tue Oct 28 02:08:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) 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=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516113964890114.93128127803482; Tue, 16 Jan 2018 06:46:04 -0800 (PST) Received: from localhost ([::1]:39388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebSUx-0000XJ-3p for importer@patchew.org; Tue, 16 Jan 2018 09:45:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebS3x-0002ww-Ih for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:18:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebS3t-0004aQ-Lo for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:18:05 -0500 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:34579) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebS3t-0004Zy-GE for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:18:01 -0500 Received: by mail-wr0-x243.google.com with SMTP id 36so15366375wrh.1 for ; Tue, 16 Jan 2018 06:18:01 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-229-84.clienti.tiscali.it. [78.12.229.84]) by smtp.gmail.com with ESMTPSA id u10sm1537758wrg.6.2018.01.16.06.17.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:17:59 -0800 (PST) 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=/FffNR7MadkBT344kEFDcnFeTguXtSH7Wp8n7QEsck0=; b=Yzv8yE+iOij5CWavKgA3rLsQqDZuIy2wfehEEdetV4H2n+agvYVgF2Pszq7ws+R+mc Q+0UP0bV/yzXaEkKQI6HVZ3xCsOCwjAWxC1F0WUTe29sQS/qZCeg1wKM9t5LbkLusyaC a8iV8UjdZDFveFM1xhYCIwdWzO8svVnzqrw5qF0yY55A7TNFelL88yKsY6pTtTg4ONLY 8oZBdkGWBMxYAkEVwgUQ7vuaDYcvQnv2fkV8QZE3OwlezbGkOwKn0FRoiMeEkjpp4ZY4 GJol0oDFQw6tT/cEntB4NbQsWwZwUeUvd6GcWrzYc9QNwmJgxnpcCK0kJlVFxqoqQ2U3 qldQ== 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=/FffNR7MadkBT344kEFDcnFeTguXtSH7Wp8n7QEsck0=; b=Zswj5rlCQ3Hasb/2p716Nj5qFa6I+ap2Ay/oOs7k0VlhRK0cmHY933Nb6FJGFzRRun o5iflWAraKJVIDfPXstD3qXTYvagXjDJQ6XLFbjrkLSzlmKNHi2+0IaLIFrxvRO7DFne XpzD/8Mha/xSILGUHqlBtSN76rQlDbC5DYZQcDp8JslFFnqhdsYap/IwR3yr8SiQWIH2 XqcCaaNwQXEj7JN4rzuTb80UolwjbT8/oz9qWSBFplqENYlDb7T+Etg3TIKrheJVXipo Fu1ZjZWQSsRSo35/SmiuT031YtsgrBDNhKlMkelj0iNnTkuwZqf4/nwhkZ9eNYFizt9I Q0wA== X-Gm-Message-State: AKGB3mJCEOeEd/xFiq6BohnzX6CKTYMDnnwAHtQscTmz3gimzj235fux b1tC6TA5k0QA7PsK6WHRDj79RKcP X-Google-Smtp-Source: ACJfBos0gSGNdnDARkgS38IVJK5BE2ZjXpvIarKLE/MisrJG+08wLHEbyWCPTzDVLwX8Epawbbpntg== X-Received: by 10.223.183.23 with SMTP id l23mr26785714wre.33.1516112280063; Tue, 16 Jan 2018 06:18:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jan 2018 15:16:58 +0100 Message-Id: <1516112253-14480-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1516112253-14480-1-git-send-email-pbonzini@redhat.com> References: <1516112253-14480-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:400c:c0c::243 Subject: [Qemu-devel] [PULL 16/51] vl: fix direct firmware directories 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: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Marc-Andr=C3=A9 Lureau Note that data_dir[] will now point to allocated strings. Fixes: Direct leak of 16 byte(s) in 1 object(s) allocated from: #0 0x7f1448181850 in malloc (/lib64/libasan.so.4+0xde850) #1 0x7f1446ed8f0c in g_malloc ../glib/gmem.c:94 #2 0x7f1446ed91cf in g_malloc_n ../glib/gmem.c:331 #3 0x7f1446ef739a in g_strsplit ../glib/gstrfuncs.c:2364 #4 0x55cf276439d7 in main /home/elmarco/src/qq/vl.c:4311 #5 0x7f143dfad039 in __libc_start_main (/lib64/libc.so.6+0x21039) Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake Message-Id: <20180104160523.22995-10-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- vl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 444b750..3599485 100644 --- a/vl.c +++ b/vl.c @@ -2318,7 +2318,7 @@ static void qemu_add_data_dir(const char *path) return; /* duplicate */ } } - data_dir[data_dir_idx++] =3D path; + data_dir[data_dir_idx++] =3D g_strdup(path); } =20 static inline bool nonempty_str(const char *str) @@ -3078,7 +3078,7 @@ int main(int argc, char **argv, char **envp) Error *main_loop_err =3D NULL; Error *err =3D NULL; bool list_data_dirs =3D false; - char **dirs; + char *dir, **dirs; typedef struct BlockdevOptions_queue { BlockdevOptions *bdo; Location loc; @@ -4181,9 +4181,12 @@ int main(int argc, char **argv, char **envp) for (i =3D 0; dirs[i] !=3D NULL; i++) { qemu_add_data_dir(dirs[i]); } + g_strfreev(dirs); =20 /* try to find datadir relative to the executable path */ - qemu_add_data_dir(os_find_datadir()); + dir =3D os_find_datadir(); + qemu_add_data_dir(dir); + g_free(dir); =20 /* add the datadir specified when building */ qemu_add_data_dir(CONFIG_QEMU_DATADIR); --=20 1.8.3.1