From nobody Sun Dec 12 14:30:30 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4123C18E8E10; Sun, 12 Dec 2021 14:30:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JBn9f6Q9tz4mJB; Sun, 12 Dec 2021 14:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B94B4226D1; Sun, 12 Dec 2021 14:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BCEUUBc066592; Sun, 12 Dec 2021 14:30:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BCEUUHC066591; Sun, 12 Dec 2021 14:30:30 GMT (envelope-from git) Date: Sun, 12 Dec 2021 14:30:30 GMT Message-Id: <202112121430.1BCEUUHC066591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 88dd7a0a3908 - main - Style List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88dd7a0a39089b4c324cc83e0b0b4c089ca0501d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639319430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MXTzzRrWO54/eGBclIStAxxABomw4r6bKIKKNsNZWI0=; b=Xrupldq/zTEUHAZIpeXGL57znzsWl9dReitPHXiacAlMmuwq1I+8Ne5WyAPgrSEgJhEw6S Xxi6GKYadR+LglT2KXvNg7BW5bdRdD79PB4HI+22ug4pKKrDDkMXM1KyBERr4Ifk1bR+n6 yjDJjsbin9MbnC4cW8JgLpVnzZQwVQqiOQ4SnyHLdMg2Nsr5RVfuOAY/iy7EOoIIaz6Trp LGaBaJKNjlgIPWcKgHp5j4rv0eu7i+6dEff2VayA+GIAgCRYqT9Iol2cbNCNiQcAMa1cSG qAT+Ej1hw8VbqTTE60Z+BBe3u482FXAPolqUieat9Jxvc6wTCOqDkOWZ/WDAOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639319430; a=rsa-sha256; cv=none; b=osjM0N0rB8nDMS8dyZFPu5KhisXbIJPUhlti4CMslgEDFRu5g/WEBSrY/ULP1BDsnNVd48 KptFG9bMAhFf4t5Se02freQI6UyK2voka/IgKr3G7dfSCzqRB4gFT0l9/LeY1IOsQd4000 Nq4YSuZEgDdXAJYb6VWPWPqH4dPexL7GLzTYdWmiNLybO3UY9velnTm824nd+pCtw1P+HK 4JwsRLkkm6QWcEyJtdtAUT0OC3MvTgWlOHanh8+QBU5BCgRs+RPXjDVcu3JrTQc+IrOmBV B5luDIvAAuFH0ltw/2LCgcJI33q1feETLfzs5MBiYhsX8tmrKIRudkesb6cRDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=88dd7a0a39089b4c324cc83e0b0b4c089ca0501d commit 88dd7a0a39089b4c324cc83e0b0b4c089ca0501d Author: Konstantin Belousov AuthorDate: 2021-12-08 15:08:59 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-12 14:28:38 +0000 Style Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D33359 --- sys/kern/imgact_elf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index f2c39e12a35f..e66adce562bc 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1157,8 +1157,8 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp) * a PT_PHDR entry. */ if (phdr[i].p_offset == 0 && - hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize - <= phdr[i].p_filesz) + hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize <= + phdr[i].p_filesz) proghdr = phdr[i].p_vaddr + hdr->e_phoff; break; case PT_INTERP: