From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 67A153858C27 for ; Wed, 20 Apr 2022 22:13:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 67A153858C27 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from reform (deer0x09.wildebeest.org [172.31.17.139]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 3444330003C8; Thu, 21 Apr 2022 00:13:00 +0200 (CEST) Received: by reform (Postfix, from userid 1000) id B006F2E81CFF; Thu, 21 Apr 2022 00:13:00 +0200 (CEST) From: Mark Wielaard To: debugedit@sourceware.org Cc: Mark Wielaard Subject: [COMMITTED] debugedit: Use standard libelf elf_strptr Date: Thu, 21 Apr 2022 00:12:34 +0200 Message-Id: <20220420221234.219657-1-mark@klomp.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: debugedit@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: debugedit development mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2022 22:13:04 -0000 The strptr function in debugedit.c does the same thing as libelf elf_strptr. But elf_strptr handles bounds checks and invalid section offsets better. And elf_strptr handles compressed sections. * tools/debugedit.c (strptr): Just call elf_strptr. Signed-off-by: Mark Wielaard --- tools/debugedit.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/tools/debugedit.c b/tools/debugedit.c index e734dd7..d82ae5a 100644 --- a/tools/debugedit.c +++ b/tools/debugedit.c @@ -1,4 +1,5 @@ /* Copyright (C) 2001-2003, 2005, 2007, 2009-2011, 2016, 2017 Red Hat, Inc. + Copyright (C) 2022 Mark J. Wielaard Written by Alexander Larsson , 2002 Based on code by Jakub Jelinek , 2001. String/Line table rewriting by Mark Wielaard , 2017. @@ -295,25 +296,9 @@ buf_read_ube32 (unsigned char *data) } static const char * -strptr (DSO *dso, int sec, off_t offset) +strptr (DSO *dso, size_t sec, size_t offset) { - Elf_Scn *scn; - Elf_Data *data; - - scn = dso->scn[sec]; - if (offset >= 0 && (GElf_Addr) offset < dso->shdr[sec].sh_size) - { - data = NULL; - while ((data = elf_getdata (scn, data)) != NULL) - { - if (data->d_buf - && offset >= data->d_off - && offset < data->d_off + data->d_size) - return (const char *) data->d_buf + (offset - data->d_off); - } - } - - return NULL; + return elf_strptr (dso->elf, sec, offset); } -- 2.30.2