From patchwork Fri Jan 12 11:30:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 859802 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UimOd9VA"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zJ1G96NYgz9t3G for ; Fri, 12 Jan 2018 22:48:01 +1100 (AEDT) Received: from localhost ([::1]:35282 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZxoW-0004NG-0N for incoming@patchwork.ozlabs.org; Fri, 12 Jan 2018 06:48:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZxYj-0007LM-Kg for qemu-devel@nongnu.org; Fri, 12 Jan 2018 06:31:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZxYi-0004vT-Ot for qemu-devel@nongnu.org; Fri, 12 Jan 2018 06:31:41 -0500 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:41217) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eZxYi-0004u6-Ir for qemu-devel@nongnu.org; Fri, 12 Jan 2018 06:31:40 -0500 Received: by mail-wr0-x242.google.com with SMTP id o7so5029124wro.8 for ; Fri, 12 Jan 2018 03:31:40 -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=UimOd9VAucMtBf2xt287kBhDWp1qKPG16/kldoKuDRqf2ZeztJOQX3V0SryZLKTLuh fqTgKSYb0zpn6NLuclHzMDhA8wh1s3lzk5UQWjYz2d2GR1uXylpmwbA8NbLOBCBh0pq6 eM7FzhqrMwl/YqZ6P4mocyCOAdYvkz30cSWWU2rdnjjm2ucGoYoNYGNQccKrlY7I6RIU z8dZa+uoWCCniapd1Z6ZV6mOqTTuaH28h7C4P8w5YbuhnMoQT7muq8eW1NBETA7jk8FW yjwAZLzKh8FrJ5YPc55UVZMJP3JNGftT9lKEtznzmBJlyvKLJ6Gn2e9ALdm7riQ7Kus+ t4mA== 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=FRx7VAyUhUopgYrkPDC3DxRxEYrqCKp8vChUGnYqbun9+ihZT8+AFyGYsjg/cYRequ aQu3TygaEZuCg0EqeRfV+fqnBi/gPZhpAr3wuVMQ/85JsDyY4Dep19c4KaXYSeuPh931 uNzeukpdgWoimixj4hKM4ytSptjRVhFsDeecXNX53S4zjsAXtWn6vc0IfnX/cR6X9GQx jH4kewu1GVf/ebswZfH3VWSnZUeXpuwgwje5lQDR95VcGUBbL8icW+4OriKWgXi3GYCW vRqhUcUR7KCgQiwS/lpXRtSzkJTkT/5lvPLYBtxc7YVee4kqE6lBuwhirzd3Q76685aR eehQ== X-Gm-Message-State: AKwxytcUoCK5KDSVe2EaV+6kJxokXcLzJpbU0C/aDNZJc43n0mhyOY1C x5DE+tnFsrKw0I6mZYO+p8HKy0Ag X-Google-Smtp-Source: ACJfBovEdnnz36VP6/YF//O0e1w8FIawupeaL6+LVsYMiMBeXAQD0ShK9uotvFc72DENYMWjwJJLGg== X-Received: by 10.223.134.58 with SMTP id 55mr4293831wrv.262.1515756699219; Fri, 12 Jan 2018 03:31:39 -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 l8sm2732271wmg.46.2018.01.12.03.31.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 03:31:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 12 Jan 2018 12:30:41 +0100 Message-Id: <1515756676-3860-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1515756676-3860-1-git-send-email-pbonzini@redhat.com> References: <1515756676-3860-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL 17/52] 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_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André 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é 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++] = path; + data_dir[data_dir_idx++] = g_strdup(path); } static inline bool nonempty_str(const char *str) @@ -3078,7 +3078,7 @@ int main(int argc, char **argv, char **envp) Error *main_loop_err = NULL; Error *err = NULL; bool list_data_dirs = 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 = 0; dirs[i] != NULL; i++) { qemu_add_data_dir(dirs[i]); } + g_strfreev(dirs); /* try to find datadir relative to the executable path */ - qemu_add_data_dir(os_find_datadir()); + dir = os_find_datadir(); + qemu_add_data_dir(dir); + g_free(dir); /* add the datadir specified when building */ qemu_add_data_dir(CONFIG_QEMU_DATADIR);