From patchwork Sun Mar 14 03:23:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mahmoud Abumandour X-Patchwork-Id: 1452606 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=QW3UbyXr; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DylKR2SQ0z9s1l for ; Sun, 14 Mar 2021 14:24:43 +1100 (AEDT) Received: from localhost ([::1]:36832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLHMv-0006Ua-CB for incoming@patchwork.ozlabs.org; Sat, 13 Mar 2021 22:24:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLHMC-0006Sr-Cb for qemu-devel@nongnu.org; Sat, 13 Mar 2021 22:23:56 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:44773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLHMA-0004Oe-KT for qemu-devel@nongnu.org; Sat, 13 Mar 2021 22:23:56 -0500 Received: by mail-wm1-x32e.google.com with SMTP id j4-20020a05600c4104b029010c62bc1e20so17443257wmi.3 for ; Sat, 13 Mar 2021 19:23:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2rnIQur47bUqEW0oQ7uZPNdfpmlBj++ZpXvn5yiPVOw=; b=QW3UbyXrUNi0DsP4sIz21ve0giEJ1Y95R38w7rbzSb4FbcYcIRJuG/JBHcrlVPuJoV 4dm1VCu1ZPWYatVwaLhdmUViW6BTAfpxejqPe8g7hoSeFqd3uRfg/4n6ZecwwEA4u8No b8CT9qxOdXxkM7WeoY7iY9eY7xqZg5U6Sgfyrpr7zfIegU5radvC4woYaE8+jBNrtA2H nGi8tL33ZkyMmpcuvFOdMI7NMymBuDJnuXLgwk3RslnvGGp4xPhrz9pUobDBeyRo9lny 3D39lK1dyJ1grYU8v8XdPeDMqmilsyBp+7OBYCkChRQSGciu/onlC69c+SvSKcQ3if7q y8LA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=2rnIQur47bUqEW0oQ7uZPNdfpmlBj++ZpXvn5yiPVOw=; b=AQmQdMm6Lqe1btAdZBqQLH7eFdDC20txGeaDNyq6YZh0zx17Klrkv6gZVR8BtmL5SF teurpM4zPHFQZHHL8D835MbfROxETSwrTcy7cQJRlpK+xyh4ErgACNmwdvhe6T1JOiCp a0ee/9pXEt4Zis7kufL8zwtIkv4vK/+VuzXpUZoj67uUjmyFmNl6kX9WQAAKr2KJnnJQ v5kjWK8H3M9r8XTJS7TrQWQ1S4L3wrfntN4ion0LqJr2AulfVd663bEaym6m3V5A+6Ea RA4c9w+3Vrg0BIeF9W1GsA7ivwqqYZ5PfubeG3J73n8kjIdVizuQdOBTTiV0to3QV3V0 iCTw== X-Gm-Message-State: AOAM532cd3OtpEXD7Mft3doknxXY5/WMB8fCbH4zpmOA1xydmArEcGL4 eTKQGr+AqE95yvZEx7LVjg6iFxE54ig= X-Google-Smtp-Source: ABdhPJxglU6hC5IdRe0q0K1qGVCCpORnCTZOjQxtQPFYT/Juxl8bqIWgZ8whmfTd+aHSP/TXRBze0Q== X-Received: by 2002:a1c:e244:: with SMTP id z65mr20079649wmg.130.1615692232156; Sat, 13 Mar 2021 19:23:52 -0800 (PST) Received: from localhost.localdomain ([197.61.164.30]) by smtp.googlemail.com with ESMTPSA id e1sm14922249wrd.44.2021.03.13.19.23.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Mar 2021 19:23:51 -0800 (PST) From: Mahmoud Mandour To: qemu-devel@nongnu.org Subject: [PATCH 1/8] bsd-user/elfload.c: Replaced calls to malloc/free with GLib variants Date: Sun, 14 Mar 2021 05:23:17 +0200 Message-Id: <20210314032324.45142-2-ma.mandourr@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210314032324.45142-1-ma.mandourr@gmail.com> References: <20210314032324.45142-1-ma.mandourr@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=ma.mandourr@gmail.com; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mahmoud Mandour Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Replaced the calls to malloc(), realloc(), and free() to their equivalents in GLib's allocation functions in various places. Signed-off-by: Mahmoud Mandour --- bsd-user/elfload.c | 74 +++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 5f4d824d78..7b0793693b 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -867,8 +867,7 @@ static abi_ulong load_elf_interp(struct elfhdr * interp_elf_ex, if (sizeof(struct elf_phdr) * interp_elf_ex->e_phnum > TARGET_PAGE_SIZE) return ~(abi_ulong)0UL; - elf_phdata = (struct elf_phdr *) - malloc(sizeof(struct elf_phdr) * interp_elf_ex->e_phnum); + elf_phdata = g_try_new(struct elf_phdr, interp_elf_ex->ephnum) if (!elf_phdata) return ~((abi_ulong)0UL); @@ -878,7 +877,7 @@ static abi_ulong load_elf_interp(struct elfhdr * interp_elf_ex, * we will be doing the wrong thing. */ if (interp_elf_ex->e_phentsize != sizeof(struct elf_phdr)) { - free(elf_phdata); + g_free(elf_phdata); return ~((abi_ulong)0UL); } @@ -891,7 +890,7 @@ static abi_ulong load_elf_interp(struct elfhdr * interp_elf_ex, if (retval < 0) { perror("load_elf_interp"); exit(-1); - free (elf_phdata); + g_free(elf_phdata); return retval; } #ifdef BSWAP_NEEDED @@ -940,7 +939,7 @@ static abi_ulong load_elf_interp(struct elfhdr * interp_elf_ex, if (error == -1) { /* Real error */ close(interpreter_fd); - free(elf_phdata); + g_free(elf_phdata); return ~((abi_ulong)0UL); } @@ -983,7 +982,7 @@ static abi_ulong load_elf_interp(struct elfhdr * interp_elf_ex, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_FIXED|MAP_PRIVATE|MAP_ANON, -1, 0); } - free(elf_phdata); + g_free(elf_phdata); *interp_load_addr = load_addr; return ((abi_ulong) interp_elf_ex->e_entry) + load_addr; @@ -1064,24 +1063,24 @@ static void load_symbols(struct elfhdr *hdr, int fd) found: /* Now know where the strtab and symtab are. Snarf them. */ - s = malloc(sizeof(*s)); - syms = malloc(symtab.sh_size); + s = g_try_malloc(sizeof(*s)); + syms = g_try_malloc(symtab.sh_size); if (!syms) { - free(s); + g_free(s); return; } - s->disas_strtab = strings = malloc(strtab.sh_size); + s->disas_strtab = strings = g_malloc(strtab.sh_size); if (!s->disas_strtab) { - free(s); - free(syms); + g_free(s); + g_free(syms); return; } lseek(fd, symtab.sh_offset, SEEK_SET); if (read(fd, syms, symtab.sh_size) != symtab.sh_size) { - free(s); - free(syms); - free(strings); + g_free(s); + g_free(syms); + g_free(strings); return; } @@ -1113,11 +1112,11 @@ static void load_symbols(struct elfhdr *hdr, int fd) that we threw away. Whether or not this has any effect on the memory allocation depends on the malloc implementation and how many symbols we managed to discard. */ - new_syms = realloc(syms, nsyms * sizeof(*syms)); + new_syms = g_try_realloc(syms, nsyms * sizeof(*syms)); if (new_syms == NULL) { - free(s); - free(syms); - free(strings); + g_free(s); + g_free(syms); + g_free(strings); return; } syms = new_syms; @@ -1126,9 +1125,9 @@ static void load_symbols(struct elfhdr *hdr, int fd) lseek(fd, strtab.sh_offset, SEEK_SET); if (read(fd, strings, strtab.sh_size) != strtab.sh_size) { - free(s); - free(syms); - free(strings); + g_free(s); + g_free(syms); + g_free(strings); return; } s->disas_num_syms = nsyms; @@ -1190,7 +1189,8 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, } /* Now read in all of the header information */ - elf_phdata = (struct elf_phdr *)malloc(elf_ex.e_phentsize*elf_ex.e_phnum); + elf_phdata = + (struct elf_phdr *)g_try_malloc(elf_ex.e_phentsizei * elf_ex.e_phnum); if (elf_phdata == NULL) { return -ENOMEM; } @@ -1204,7 +1204,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, if (retval < 0) { perror("load_elf_binary"); exit(-1); - free (elf_phdata); + g_free(elf_phdata); return -errno; } @@ -1231,8 +1231,8 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, if (elf_ppnt->p_type == PT_INTERP) { if ( elf_interpreter != NULL ) { - free (elf_phdata); - free(elf_interpreter); + g_free(elf_phdata); + g_free(elf_interpreter); close(bprm->fd); return -EINVAL; } @@ -1242,10 +1242,10 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, * is an a.out format binary */ - elf_interpreter = (char *)malloc(elf_ppnt->p_filesz); + elf_interpreter = (char *)g_try_malloc(elf_ppnt->p_filesz); if (elf_interpreter == NULL) { - free (elf_phdata); + g_free(elf_phdata); close(bprm->fd); return -ENOMEM; } @@ -1298,8 +1298,8 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, if (retval < 0) { perror("load_elf_binary3"); exit(-1); - free (elf_phdata); - free(elf_interpreter); + g_free(elf_phdata); + g_free(elf_interpreter); close(bprm->fd); return retval; } @@ -1323,8 +1323,8 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, } if (!interpreter_type) { - free(elf_interpreter); - free(elf_phdata); + g_free(elf_interpreter); + g_free(elf_phdata); close(bprm->fd); return -ELIBBAD; } @@ -1346,8 +1346,8 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, } } if (!bprm->p) { - free(elf_interpreter); - free (elf_phdata); + g_free(elf_interpreter); + g_free(elf_phdata); close(bprm->fd); return -E2BIG; } @@ -1486,17 +1486,17 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, reloc_func_desc = interp_load_addr; close(interpreter_fd); - free(elf_interpreter); + g_free(elf_interpreter); if (elf_entry == ~((abi_ulong)0UL)) { printf("Unable to load interpreter\n"); - free(elf_phdata); + g_free(elf_phdata); exit(-1); return 0; } } - free(elf_phdata); + g_free(elf_phdata); if (qemu_log_enabled()) load_symbols(&elf_ex, bprm->fd);