From owner-svn-src-stable-11@freebsd.org Thu Jun 25 06:44:59 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 784A3353174; Thu, 25 Jun 2020 06:44:59 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 49sr9M2qxLz3Rmh; Thu, 25 Jun 2020 06:44:55 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id 05P6ien8042127 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 25 Jun 2020 09:44:43 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 05P6ien8042127 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id 05P6ie7f042125; Thu, 25 Jun 2020 09:44:40 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 25 Jun 2020 09:44:40 +0300 From: Konstantin Belousov To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r362608 - stable/11/libexec/rtld-elf Message-ID: <20200625064440.GA32126@kib.kiev.ua> References: <202006250639.05P6dJfY098315@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202006250639.05P6dJfY098315@repo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 49sr9M2qxLz3Rmh X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com X-Spamd-Result: default: False [1.38 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_FROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; NEURAL_SPAM_MEDIUM(0.72)[0.721]; NEURAL_HAM_SHORT(-0.10)[-0.103]; NEURAL_SPAM_LONG(0.76)[0.759]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_ENVFROM(0.00)[gmail.com]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 06:44:59 -0000 On Thu, Jun 25, 2020 at 06:39:19AM +0000, Konstantin Belousov wrote: > Author: kib > Date: Thu Jun 25 06:39:18 2020 > New Revision: 362608 > URL: https://svnweb.freebsd.org/changeset/base/362608 > > Log: > MFC r362347: > rtld: Apply relro to itself. On stable/11, due to the configuration of old bfd ld, rtld does not have relro segment, so this is a merge to keep code similar between branches. > > Modified: > stable/11/libexec/rtld-elf/rtld.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/libexec/rtld-elf/rtld.c > ============================================================================== > --- stable/11/libexec/rtld-elf/rtld.c Thu Jun 25 05:44:06 2020 (r362607) > +++ stable/11/libexec/rtld-elf/rtld.c Thu Jun 25 06:39:18 2020 (r362608) > @@ -2209,6 +2209,7 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info) > obj_rtld.path = xstrdup(ld_path_rtld); > > parse_rtld_phdr(&obj_rtld); > + obj_enforce_relro(&obj_rtld); > > r_debug.r_brk = r_debug_state; > r_debug.r_state = RT_CONSISTENT;