From patchwork Mon Jan 17 14:51:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 50111 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 752F63858015 for ; Mon, 17 Jan 2022 14:51:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 752F63858015 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1642431088; bh=qGqim2bhkQ+Ihq3MjZC0h3UggP97UCsLcQvHeQPHlSg=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:Cc:From; b=T3JB2hKng7dZhRkIBOHQAk7mIuUzxHqBwgQpyMEdhJdoVQuBO+1gVEuTdRvllzfz3 c1ZlpuTZwOzlVVAOMp6dado7lbaQYpIwf4jt/1u3RFnYKVWFNOMZ/K1CLT1C7NxmYh NNcIpYt2EHtk3fFjyeXtNPMyo/RXRmtvZywT2YJM= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-wm1-x349.google.com (mail-wm1-x349.google.com [IPv6:2a00:1450:4864:20::349]) by sourceware.org (Postfix) with ESMTPS id 0CE243858D3C for ; Mon, 17 Jan 2022 14:51:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0CE243858D3C Received: by mail-wm1-x349.google.com with SMTP id s190-20020a1ca9c7000000b00347c6c39d9aso18994wme.5 for ; Mon, 17 Jan 2022 06:51:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=qGqim2bhkQ+Ihq3MjZC0h3UggP97UCsLcQvHeQPHlSg=; b=SRqGNnA01OVES61SmvQvbtA5vfPjDlIqLEy1kBveiN8Bgl0Uc+T7g6kco+UDaDMBej mFZlYyn2WItRGzmItWdv/SoX3x2jnAp6eiIJ6HPBTf7LDgth264swDMFLn1v8OmcWj17 igG7SdC4Pogiwwjx5vQ9B0V9OrTjp/ZIn8B3XMniAbaDpTRQ86JwCxfG2dZlDhyY2dP/ Dx5XFOUspFS1uCaIuvW1ULkWkBKAPtcuTFiNfjTSwXfzjRWxw68jEmX2g0AjPZz4jZGZ eeLZ5z0t8qxxlRWg4m2T13QLIrZrhD3F9bB180erlGT0av5ATAWr+m2YYjml4RMmYrS6 6QpQ== X-Gm-Message-State: AOAM532Ka9FyZavDMMDP4IBiJ34Bq1jJoz0wC1NfwmK9evjplqfq6qm9 DSyELUHDbAA5kOgYcGUkPmhzboAPzoZALZ+IFkdGeM1K/dKc5cuqUCMHV2sg1524xh3Z7kCW0MS UWnf6tqad5xUxW1T//xlRUv8k7ATCZomP33hWYO62/p0KoTM8oXlSNyjF814th6KEik7NqaE= X-Google-Smtp-Source: ABdhPJxdvm+d6BVExBDKEOsyGsf+txdZTNzwVsRECkNHxyINEyGrFr+8Sdk1jSBun8ajssZrpTrVheSkzT2CnA== X-Received: from tef.lon.corp.google.com ([2a00:79e0:d:210:24a0:43e8:35b9:422]) (user=gprocida job=sendgmr) by 2002:a5d:6d50:: with SMTP id k16mr19319858wri.693.1642431081401; Mon, 17 Jan 2022 06:51:21 -0800 (PST) Date: Mon, 17 Jan 2022 14:51:15 +0000 Message-Id: <20220117145115.659444-1-gprocida@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.34.1.703.g22d0c6ccf7-goog Subject: [PATCH] DWARF reader: use size_t for DWARF expression length To: libabigail@sourceware.org X-Spam-Status: No, score=-22.4 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Giuliano Procida via Libabigail From: Giuliano Procida Reply-To: Giuliano Procida Cc: maennich@google.com, kernel-team@android.com, mark@klomp.org Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" A recent change broke 32-bit builds due to an implicit assumption that size_t == uint64_t. This appears in the elfutils dwarf_getlocation* functions' types. This commit updates callers and other functions to use size_t consistently for such expression lengths and indexes. * src/abg-dwarf-reader.cc (die_location_expr): Change expr_len argument type to size_t*. (op_manipulates_stack): Change expr_len and index argument types to size_t; change next_index argument type to size_t&. (eval_last_constant_dwarf_sub_expr): Change expr_len argument and local variables index and next_index types to size_t. (die_member_offset): Change local variable expr_len type to size_t. (die_location_address): Likewise. (die_virtual_function_index): Likewise. Fixes: 16207c4af7bc ("Bug 28191 - Interpret DWARF 5 addrx locations") Signed-off-by: Giuliano Procida --- src/abg-dwarf-reader.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index f125196d..7ee8c04a 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -7686,7 +7686,7 @@ static bool die_location_expr(const Dwarf_Die* die, unsigned attr_name, Dwarf_Op** expr, - uint64_t* expr_len) + size_t* expr_len) { if (!die) return false; @@ -8022,9 +8022,9 @@ op_pushes_non_constant_value(Dwarf_Op* ops, /// DEVM stack, false otherwise. static bool op_manipulates_stack(Dwarf_Op* expr, - uint64_t expr_len, - uint64_t index, - uint64_t& next_index, + size_t expr_len, + size_t index, + size_t& next_index, dwarf_expr_eval_context& ctxt) { Dwarf_Op& op = expr[index]; @@ -8398,7 +8398,7 @@ eval_quickly(Dwarf_Op* expr, /// to evaluate, false otherwise. static bool eval_last_constant_dwarf_sub_expr(Dwarf_Op* expr, - uint64_t expr_len, + size_t expr_len, int64_t& value, bool& is_tls_address, dwarf_expr_eval_context &eval_ctxt) @@ -8407,7 +8407,7 @@ eval_last_constant_dwarf_sub_expr(Dwarf_Op* expr, // expression contained in the DWARF expression 'expr'. eval_ctxt.reset(); - uint64_t index = 0, next_index = 0; + size_t index = 0, next_index = 0; do { if (op_is_arith_logic(expr, expr_len, index, @@ -8452,7 +8452,7 @@ eval_last_constant_dwarf_sub_expr(Dwarf_Op* expr, /// to evaluate, false otherwise. static bool eval_last_constant_dwarf_sub_expr(Dwarf_Op* expr, - uint64_t expr_len, + size_t expr_len, int64_t& value, bool& is_tls_address) { @@ -8775,7 +8775,7 @@ die_member_offset(const read_context& ctxt, int64_t& offset) { Dwarf_Op* expr = NULL; - uint64_t expr_len = 0; + size_t expr_len = 0; uint64_t bit_offset = 0; // First let's see if the DW_AT_data_bit_offset attribute is @@ -8852,7 +8852,7 @@ die_location_address(Dwarf_Die* die, bool& is_tls_address) { Dwarf_Op* expr = NULL; - uint64_t expr_len = 0; + size_t expr_len = 0; is_tls_address = false; @@ -8898,7 +8898,7 @@ die_virtual_function_index(Dwarf_Die* die, return false; Dwarf_Op* expr = NULL; - uint64_t expr_len = 0; + size_t expr_len = 0; if (!die_location_expr(die, DW_AT_vtable_elem_location, &expr, &expr_len)) return false;