GNU C Library master sources branch hjl/pr22459/master created. glibc-2.26.9000-794-g277904c

[hjl at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, hjl/pr22459/master has been created
        at  277904c8434d46999674d9b4eb2871cd0039d8f2 (commit)

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=277904c8434d46999674d9b4eb2871cd0039d8f2

commit 277904c8434d46999674d9b4eb2871cd0039d8f2
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Sun Nov 19 11:23:05 2017 -0800

    libc.so: Replace nscd_hash.os with libc-nscd_hash.os [BZ #22459]
    
    nscd_hash.os is needed both libc.so as well as nscd.  Since nscd_hash.os
    is compiled as the part of nscd, when -fstack-protector-all is used,
    nscd_hash.os calls __stack_chk_fail via PLT, which leads to
    
    FAIL: elf/check-localplt
    Extra PLT reference: libc.so: __stack_chk_fail
    
    This patch replaces nscd_hash.os with libc-nscd_hash.os in libc_pic.a
    to avoid calling __stack_chk_fail via PLT inside of libc.so.
    
    	[BZ #22459]
    	* nscd/Makefile (aux): Replace nscd_hash with libc-nscd_hash.
    	* nscd/libc-nscd_hash.c: New file.

diff --git a/nscd/Makefile b/nscd/Makefile
index 095f3e5..7ae6518 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -25,7 +25,7 @@ include ../Makeconfig
 ifneq ($(use-nscd),no)
 routines := nscd_getpw_r nscd_getgr_r nscd_gethst_r nscd_getai \
 	    nscd_initgroups nscd_getserv_r nscd_netgroup
-aux	:= nscd_helper nscd_hash
+aux	:= nscd_helper libc-nscd_hash
 endif
 
 # To find xmalloc.c
diff --git a/nscd/libc-nscd_hash.c b/nscd/libc-nscd_hash.c
new file mode 100644
index 0000000..743f1ad
--- /dev/null
+++ b/nscd/libc-nscd_hash.c
@@ -0,0 +1,19 @@
+/* Used in libc.so to avoid calling __stack_chk_fail via PLT.
+   Copyright (C) 2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <nscd_hash.c>

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU C Library master sources