From nobody Tue Jan 21 01:51:01 2025 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 4YcVY21kWpz5lJct; Tue, 21 Jan 2025 01:51:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YcVY15Bvsz3cCg; Tue, 21 Jan 2025 01:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737424261; 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=t9YAh+cgaVbz+1gPYklrfF95WDL+fnKa54BVv/1yNZ4=; b=cpLUwKzwEBOYoYfA0RWY+z4CWKrJljhD8I4u82E6Ys8B42rxfkBNokZJIItNNF0scIlyY+ AkaQO4L9yxqoliLx4w2pLmibrxa+mHqbnA/oDxsRhdadciLiv8929k4A98zEjcIbHX52YC KiCaOPGwzcwLuJMksNZn9hgptS3YHXeJpPmcnF/MN8yBQqSoD4VOCUU69KI1n9m348HFLT ulbrwpGP4IsUqOtQ4uHTxr5oYkshA3ElhZRGA/ZkKEehzdRR9hcTOkG3XDWQndWSv40T/s PEDc9SDdkNZ/OLLEEGzwYWvB5aGVjRduHLIq8aFdf0HwX+MYmcNr8gC4LHKfqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737424261; 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=t9YAh+cgaVbz+1gPYklrfF95WDL+fnKa54BVv/1yNZ4=; b=LPphGY+rmrzP95ReuNzEqr1CCIjl7htUQKciR89eHvxPjVEvq51HnbM660zTXI/tHwfakm L/w7QBBUTa9fs+d9Ahv2LvtNLByVRU74eO75N0nvGsa1KhaLS+gJ8IwdDqbCakdNu3AUtb ttUDOehknrKsEbj1lIl5FaSDCYYDWFQHoJDD00hf6OSgCSOkAgvuCu4LD4H+twydXNdRAB zIALEkE/3POFK2ONJogwi4bmFnq94h/EeVFxF7FAyf6esKLEYSw3pCwwK7bOOE05wjsH9A Is6SeH4teHZE9vnX3wNTP1EnGXZF3tn1b1QQrMmqUDa/UmvbX4OubT81lGcH2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737424261; a=rsa-sha256; cv=none; b=BruwLn3DGga7OisZsElz1T3fQnJsHzOeU/aDRFdIksvOd6/3/nBiggkcMviOyFwDgR+6bT k+nngNYX+lHYGdjOfhOiwgwmTaAJzq6Y4Z9MMSS+/Aj0O6/YaWjWITr/l2Ccu9HofvlwHO B2yrLvGHNgj7cGAGgvns5oJ3QeS/HEbSj9pOwll8Dc9tewgzSMKcYKTsVKv+vxzx8sz+3i IzLZ/jqLPpS1iTsqUnz41R9cN85q5zmW0P9/DAFp6pMtt7aivhe5DZ78KZJCNe35MePD/I fcJ1UJukT3CskqE/Rn8VdzCcvgB2tWbYa0zajSBSpOw5Ke9CfXnYwcREoswhjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YcVY14Yrtzlt4; Tue, 21 Jan 2025 01:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50L1p1S3074143; Tue, 21 Jan 2025 01:51:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50L1p17X074140; Tue, 21 Jan 2025 01:51:01 GMT (envelope-from git) Date: Tue, 21 Jan 2025 01:51:01 GMT Message-Id: <202501210151.50L1p17X074140@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: bf3fbf74d12c - main - rtld obj_remap_relro(): unindent the loop body 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: bf3fbf74d12cc6dff54ed17acf4a680cc0c9cdee Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bf3fbf74d12cc6dff54ed17acf4a680cc0c9cdee commit bf3fbf74d12cc6dff54ed17acf4a680cc0c9cdee Author: Konstantin Belousov AuthorDate: 2025-01-18 23:23:28 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-21 01:44:22 +0000 rtld obj_remap_relro(): unindent the loop body Discussed with: emaste, imp Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D48509 --- libexec/rtld-elf/rtld.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 8ec883227908..169ec0200ea5 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5987,20 +5987,18 @@ obj_remap_relro(Obj_Entry *obj, int prot) for (ph = obj->phdr; (const char *)ph < (const char *)obj->phdr + obj->phsize; ph++) { - switch (ph->p_type) { - case PT_GNU_RELRO: - relro_page = obj->relocbase + - rtld_trunc_page(ph->p_vaddr); - relro_size = rtld_round_page(ph->p_vaddr + - ph->p_memsz) - rtld_trunc_page(ph->p_vaddr); - if (mprotect(relro_page, relro_size, prot) == -1) { - _rtld_error( + if (ph->p_type != PT_GNU_RELRO) + continue; + relro_page = obj->relocbase + rtld_trunc_page(ph->p_vaddr); + relro_size = rtld_round_page(ph->p_vaddr + ph->p_memsz) - + rtld_trunc_page(ph->p_vaddr); + if (mprotect(relro_page, relro_size, prot) == -1) { + _rtld_error( "%s: Cannot set relro protection to %#x: %s", - obj->path, prot, rtld_strerror(errno)); - return (-1); - } - break; + obj->path, prot, rtld_strerror(errno)); + return (-1); } + break; } return (0); }