From nobody Sun Dec 19 02:44:25 2021 X-Original-To: dev-commits-src-all@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 3AE7B18E48B8; Sun, 19 Dec 2021 02:44:26 +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 4JGn9j70d3z4qD3; Sun, 19 Dec 2021 02:44:25 +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 D0BEE1ACBA; Sun, 19 Dec 2021 02:44:25 +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 1BJ2iP3U012535; Sun, 19 Dec 2021 02:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BJ2iPp5012534; Sun, 19 Dec 2021 02:44:25 GMT (envelope-from git) Date: Sun, 19 Dec 2021 02:44:25 GMT Message-Id: <202112190244.1BJ2iPp5012534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 995954f0dd3d - stable/13 - Style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 995954f0dd3db7348c39678f331f24496bc7c777 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639881866; 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=MKURrZu1Yi6OVGPPZzBEXXoTsOX/X2AYSGOtFvhyJH0=; b=PKiXfDdwlR2Dh1TNFRa/GdnX6rExm4GWIGSRCe2zvPJ9jB4nOgDPtfsRslDRaJvpJhJ6f6 BoFcWwToyHpc+W3lPgF6MksnKMrzJfCGpyNobw9Iv86Bq8sXDwtw8FX05xP3wEDLPv19js 1FScBZX80z3saPBlvEJsqyLKaBseD95NKtwZCHBU6BFvgsdpWLtgtdYMVIXC4V1D0R2UZx 0qlvtnKnOf7l19ZSv/baR9bgxOtPVaIaTpUDyi0q2IiFIRD/p2iWNnlYSzjnsXaIR9zYs/ YmZan8oSJKGWOXPlwPf8BhvgkoUCw1tlrFinU56JFH5eMLuhzXuyTu12qtk6HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639881866; a=rsa-sha256; cv=none; b=agQOWS0qVs5vLf5Aj6C9PZHO35DrNG105x6QP2vjY0skDr8p+q0/n7CTo8ryIQSfRyevyg TMJwGQrAPin/feWTMHcBy36UwwbVCe4xDuqkVdCb8WLjeb4utHvhbpwF1nYuR4dTYkdcoo AaoeUlkV9fDWTASurWt6uVkHSXj3DdwOTHF+Sbi19KIsrSlp3N4bGXMVpksxjIuapS1M8Q nbhXQkt3EPm108oJBLKMdPVi8657YGymHD204o0/OxzCEj9TMsG/tpAC0Y4RpIl2ykLJTV Xkm0LCLKqqlWFN8jIZnR7ToHa//2O/EPVwRMa2hGRzoFdZnlUx1OMdSDvpYYqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=995954f0dd3db7348c39678f331f24496bc7c777 commit 995954f0dd3db7348c39678f331f24496bc7c777 Author: Konstantin Belousov AuthorDate: 2021-12-08 15:08:59 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-19 02:42:50 +0000 Style (cherry picked from commit 88dd7a0a39089b4c324cc83e0b0b4c089ca0501d) --- 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 18ddbae57d4a..9b7d26257ea3 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1137,8 +1137,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: