From owner-svn-src-head@freebsd.org Wed May 9 10:30:57 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D4EBFB2767; Wed, 9 May 2018 10:30:57 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F3FE79ED5; Wed, 9 May 2018 10:30:57 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 307D11035B; Wed, 9 May 2018 10:30:57 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w49AUvHA061449; Wed, 9 May 2018 10:30:57 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w49AUuMi061447; Wed, 9 May 2018 10:30:56 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201805091030.w49AUuMi061447@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 9 May 2018 10:30:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333398 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 333398 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2018 10:30:58 -0000 Author: kib Date: Wed May 9 10:30:56 2018 New Revision: 333398 URL: https://svnweb.freebsd.org/changeset/base/333398 Log: Make rtld use libc_nossp_pic.a. Remove SSP shims. Submitted by: Luis Pires Reviewed by: brooks Differential revision: https://reviews.freebsd.org/D15341 Modified: head/libexec/rtld-elf/Makefile head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/Makefile ============================================================================== --- head/libexec/rtld-elf/Makefile Wed May 9 10:28:24 2018 (r333397) +++ head/libexec/rtld-elf/Makefile Wed May 9 10:30:56 2018 (r333398) @@ -51,7 +51,7 @@ CFLAGS+= -fvisibility=hidden CFLAGS.reloc.c+=-fno-jump-tables .endif LDFLAGS+= -shared -Wl,-Bsymbolic -Wl,-z,defs -LIBADD= c_pic +LIBADD= c_nossp_pic .if ${MK_TOOLCHAIN} == "no" LDFLAGS+= -L${LIBCDIR} .endif Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Wed May 9 10:28:24 2018 (r333397) +++ head/libexec/rtld-elf/rtld.c Wed May 9 10:30:56 2018 (r333398) @@ -238,8 +238,6 @@ void _rtld_error(const char *, ...) __exported; int npagesizes, osreldate; size_t *pagesizes; -long __stack_chk_guard[8] = {0, 0, 0, 0, 0, 0, 0, 0}; - static int stack_prot = PROT_READ | PROT_WRITE | RTLD_DEFAULT_STACK_EXEC; static int max_stack_flags; @@ -360,8 +358,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entr char **argv, *argv0, **env, **envp, *kexecpath, *library_path_rpath; caddr_t imgentry; char buf[MAXPATHLEN]; - int argc, fd, i, mib[2], phnum, rtld_argc; - size_t len; + int argc, fd, i, phnum, rtld_argc; bool dir_enable, explicit_fd, search_in_path; /* @@ -399,27 +396,6 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entr main_argc = argc; main_argv = argv; - if (aux_info[AT_CANARY] != NULL && - aux_info[AT_CANARY]->a_un.a_ptr != NULL) { - i = aux_info[AT_CANARYLEN]->a_un.a_val; - if (i > sizeof(__stack_chk_guard)) - i = sizeof(__stack_chk_guard); - memcpy(__stack_chk_guard, aux_info[AT_CANARY]->a_un.a_ptr, i); - } else { - mib[0] = CTL_KERN; - mib[1] = KERN_ARND; - - len = sizeof(__stack_chk_guard); - if (sysctl(mib, 2, __stack_chk_guard, &len, NULL, 0) == -1 || - len != sizeof(__stack_chk_guard)) { - /* If sysctl was unsuccessful, use the "terminator canary". */ - ((unsigned char *)(void *)__stack_chk_guard)[0] = 0; - ((unsigned char *)(void *)__stack_chk_guard)[1] = 0; - ((unsigned char *)(void *)__stack_chk_guard)[2] = '\n'; - ((unsigned char *)(void *)__stack_chk_guard)[3] = 255; - } - } - trust = !issetugid(); md_abi_variant_hook(aux_info); @@ -5535,23 +5511,6 @@ int _thread_autoinit_dummy_decl = 1; void __pthread_cxa_finalize(struct dl_phdr_info *a) { -} - -void -__stack_chk_fail(void) -{ - - _rtld_error("stack overflow detected; terminated"); - rtld_die(); -} -__weak_reference(__stack_chk_fail, __stack_chk_fail_local); - -void -__chk_fail(void) -{ - - _rtld_error("buffer overflow detected; terminated"); - rtld_die(); } const char *