From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by sourceware.org (Postfix) with ESMTPS id D33F638515DA for ; Wed, 26 Jan 2022 12:10:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D33F638515DA Received: by mail-oi1-x22a.google.com with SMTP id m9so22581371oia.12 for ; Wed, 26 Jan 2022 04:10:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=e9O9mpfpeRy4FWTA3cYOzZJmjiAwDvJPiLdzBP309HU=; b=QwEX+WieCSSjHVEFuehE8GMLcPYUPjFdtT0w6JDxVfSiu4E/veng+79IbSgpAKOHQt 1H5G3q1ARLjAf41On+9J6Qf8PMLWEkLo8un74s3cPK6WrZlaKQ5iZaSuMU3SNuhkRArv lWn1GpBYlBCP2H0cISSANnVB084+rkpJiC695Lltfpcrt5wjujUDpPmahkh7EY4iFBzA 63Kww9O2loWdW0cdsmN8zz1N4Xp6n2bBU/slJ2HeQ0sfLXbqdyhxBBNLR5LeJuf3BYuz b0gpTHPZbiPS3l5jr+JSCON7tSI0Pi4oeKlkLN8DqT/a/9uzfo79eubg3suDp7b157p7 feOw== X-Gm-Message-State: AOAM5319gLQUBEDmx6xgFMHuPa4ydbp3aUWJnqxSOC/g9NtX9XkRdSiP 0ZNetGbXCAqL8sRrY7yMLlnVsA== X-Google-Smtp-Source: ABdhPJzRWjwP+bwJjy1Hsvp5USgawIJNrAZIsPDWtphnKvwQVslDABA7sJnOaf+F3TkkNfmW93OLZA== X-Received: by 2002:a05:6808:23c6:: with SMTP id bq6mr3599847oib.225.1643199039155; Wed, 26 Jan 2022 04:10:39 -0800 (PST) Received: from ?IPV6:2804:431:c7cb:27f8:9b70:219c:7964:43d? ([2804:431:c7cb:27f8:9b70:219c:7964:43d]) by smtp.gmail.com with ESMTPSA id 100sm130331oth.75.2022.01.26.04.10.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Jan 2022 04:10:38 -0800 (PST) Message-ID: <4ff7e613-2f51-cd9f-1466-68388f6a2a3a@linaro.org> Date: Wed, 26 Jan 2022 09:10:36 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH] elf: Replace tst-p_alignmod1-editX with a python script Content-Language: en-US To: Florian Weimer , Adhemerval Zanella via Libc-alpha Cc: "H . J . Lu" , Carlos O'Donell , Joseph Myers References: <20220125170523.952874-1-adhemerval.zanella@linaro.org> <877damvmen.fsf@oldenburg.str.redhat.com> From: Adhemerval Zanella In-Reply-To: <877damvmen.fsf@oldenburg.str.redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jan 2022 12:10:42 -0000 On 26/01/2022 07:09, Florian Weimer wrote: > * Adhemerval Zanella via Libc-alpha: > >> diff --git a/scripts/tst-elf-edit.py b/scripts/tst-elf-edit.py >> new file mode 100644 >> index 0000000000..1fb9b8e0fe >> --- /dev/null >> +++ b/scripts/tst-elf-edit.py >> @@ -0,0 +1,206 @@ > >> +class Elf_Ehdr: >> + def __init__(self, e_ident): >> + endian, addr, off = elf_types_fmts(e_ident) >> + self.fmt = '{0}HHI{1}{2}{2}IHHHHHH'.format(endian, addr, off) >> + self.len = struct.calcsize(self.fmt) >> + >> + def read(self, f): >> + buf = f.read(self.len) >> + if not buf: >> + error('{}: header too small'.format(f.name)) > > I think you need to check len(buf) < self.len. Ack. > >> +class Elf_Phdr: >> + def __init__(self, e_ident): >> + endian, addr, off = elf_types_fmts(e_ident) >> + self.ei_class = e_ident[EI_CLASS] >> + if self.ei_class == ELFCLASS32: >> + self.fmt = '{0}I{2}{1}{1}IIII'.format(endian, addr, off) >> + else: >> + self.fmt = '{0}II{2}{1}{1}QQQ'.format(endian, addr, off) >> + self.len = struct.calcsize(self.fmt) >> + >> + def read(self, f): >> + buf = f.read(self.len) >> + if not buf: >> + error('{}: program header too small'.format(f.name)) > > Here as well. Ack. > > Rest looks okay. Thanks, I push it upstream with the above fixes installed.