From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by sourceware.org (Postfix) with ESMTPS id 51926386F0F9 for ; Sat, 9 Jul 2022 12:31:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 51926386F0F9 Received: by mail-pl1-x636.google.com with SMTP id q5so895646plr.11 for ; Sat, 09 Jul 2022 05:31:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition; bh=QJUt1MbNShzlmTajBisQppaAGbo/Wpl8E+m92vRrmPg=; b=rSUWyvpEqAUbKSrxRBb4dzHkxEEg7WN/3aoUcGfqLjITt3PS6CbcLFa3pzk6DOnspG c/eo0pgDqMMARZsMfdYYUlF0ak0W6tyBjBaHTmPhk2xfseU3p4sVnHe6bnNfiIEcNF1D Aq+yAQEPhXdoa2xoYKN8edJB5o9Mb0JyCBmiy62Ay/BbJ38V7dUjzhunbwp6KfNRL7Pv URl+FxeiTkINoRQj3An4fHMMr1YwAeZps7gcATyfUctBEGiNCD+mUAiqCkEWXzY9wLYr ckzhaEeseOf6a1rHfOmC+wWkRay+lCOsDFU4HXrOcsXXk12EqE/0sGZ+taoo6CjpfGsN aSeA== X-Gm-Message-State: AJIora+q9QXAfzDbGDwkNPljr98qnKIjawPrdSYmuFXbr6ePe8zLyVcE YKNjoJuOIOX6cBrdS9w3lQvDY6AQauw= X-Google-Smtp-Source: AGRyM1vrZAU1Pxvvgno2mzLV/mg6jEUsQ2w4C0j9EUR1DS0KNVzhOiJD+mdCAvIOHkR6JUeJ5DPkeA== X-Received: by 2002:a17:902:c992:b0:16b:d8b9:1c5f with SMTP id g18-20020a170902c99200b0016bd8b91c5fmr8566557plc.93.1657369915165; Sat, 09 Jul 2022 05:31:55 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:4b98:7b4b:d3e3:2ead]) by smtp.gmail.com with ESMTPSA id u3-20020a627903000000b00528999fba99sm1410303pfc.175.2022.07.09.05.31.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Jul 2022 05:31:54 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 756B21143046; Sat, 9 Jul 2022 22:01:52 +0930 (ACST) Date: Sat, 9 Jul 2022 22:01:52 +0930 From: Alan Modra To: binutils@sourceware.org Subject: ppc gas: don't leak ppc_hash memory Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3036.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jul 2022 12:31:58 -0000 * config/tc-ppc.c (insn_obstack): New. (insn_calloc): New function. (ppc_setup_opcodes): Use insn_obstack for ppc_hash. (ppc_md_end): New function. * config/tc-ppc.h (ppc_md_end): Declare (md_end): Define. diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c index 0c3e670d11b..ac61cd8f122 100644 --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -976,6 +976,10 @@ ppc_optimize_expr (expressionS *left, operatorT op, expressionS *right) /* Whether to target xcoff64/elf64. */ static unsigned int ppc_obj64 = BFD_DEFAULT_TARGET_SIZE == 64; +/* A separate obstack for use by ppc_hash, so that we can quickly + throw away hash table memory . */ +struct obstack insn_obstack; + /* Opcode hash table. */ static htab_t ppc_hash; @@ -1613,6 +1617,21 @@ insn_validate (const struct powerpc_opcode *op) return false; } +static void * +insn_calloc (size_t n, size_t size) +{ + size_t amt; + void *ret; + if (gas_mul_overflow (n, size, &amt)) + { + obstack_alloc_failed_handler (); + abort (); + } + ret = obstack_alloc (&insn_obstack, amt); + memset (ret, 0, amt); + return ret; +} + /* Insert opcodes into hash tables. Called at startup and for .machine pseudo. */ @@ -1624,10 +1643,16 @@ ppc_setup_opcodes (void) bool bad_insn = false; if (ppc_hash != NULL) - htab_delete (ppc_hash); + { + htab_delete (ppc_hash); + _obstack_free (&insn_obstack, NULL); + } + + obstack_begin (&insn_obstack, chunksize); /* Insert the opcodes into a hash table. */ - ppc_hash = str_htab_create (); + ppc_hash = htab_create_alloc (5000, hash_string_tuple, eq_string_tuple, + NULL, insn_calloc, NULL); if (ENABLE_CHECKING) { @@ -1875,6 +1900,13 @@ md_begin (void) #endif } +void +ppc_md_end (void) +{ + htab_delete (ppc_hash); + _obstack_free (&insn_obstack, NULL); +} + void ppc_cleanup (void) { diff --git a/gas/config/tc-ppc.h b/gas/config/tc-ppc.h index e335aa611fe..ed06a296382 100644 --- a/gas/config/tc-ppc.h +++ b/gas/config/tc-ppc.h @@ -256,6 +256,9 @@ extern void ppc_elf_md_finish (void); #endif /* OBJ_ELF */ +extern void ppc_md_end (void); +#define md_end ppc_md_end + #if defined (OBJ_ELF) || defined (OBJ_XCOFF) #define TC_FORCE_RELOCATION(FIX) ppc_force_relocation (FIX) extern int ppc_force_relocation (struct fix *); -- Alan Modra Australia Development Lab, IBM