From patchwork Mon Oct 19 19:31:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 532527 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3447D1401F6 for ; Tue, 20 Oct 2015 06:32:01 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=KIiGUspK; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; q=dns; s=default; b= d8DAi8Eb1n74+5TqZyin7IW1iX7AxBHyfE5BCfvFp96UzgSPDsPm3bN3MRTweJgd QqJQ8JXLyUAyEZ7S0w+zPuaGtl3Y7gCXFJ3eFOFZJeKh5/wrAKlxq1dq4h6Q4UUY Qky5wpCiBe3XhiOxSy194wAhehWKOQN0Ap3BjOIy/OA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; s=default; bh=e6RH5 iejk0PAz7uzLvKPwy6L/cY=; b=KIiGUspKovFz6dxIcKYyr/FuKqWS4FdiZ6UDA lRVVRT1FdP9N8b3Khrxai5gL0d9BOJkiPY/LYDbG1fOc2PX44dzA3hi0YZ8+GjLw 6n5Hf8dYA8xdHVhXnJQ3SkfeBJKl8/PbahN7Uuys5vBFWv227etmsAhEydBZ102d dWbWvQ= Received: (qmail 2965 invoked by alias); 19 Oct 2015 19:31:55 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 2926 invoked by uid 89); 19 Oct 2015 19:31:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.1 required=5.0 tests=AWL, BAYES_50, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-oi0-f54.google.com MIME-Version: 1.0 X-Received: by 10.202.179.69 with SMTP id c66mr19447259oif.67.1445283110484; Mon, 19 Oct 2015 12:31:50 -0700 (PDT) In-Reply-To: <20151019183113.29D732C3AA0@topped-with-meat.com> References: <1445189141-18068-1-git-send-email-hjl.tools@gmail.com> <20151019183113.29D732C3AA0@topped-with-meat.com> Date: Mon, 19 Oct 2015 12:31:49 -0700 Message-ID: Subject: Re: [PATCH 1/3] Mark ld.so internel mmap functions hidden From: "H.J. Lu" To: Roland McGrath Cc: GNU C Library On Mon, Oct 19, 2015 at 11:31 AM, Roland McGrath wrote: > NAK to #ifdef in generic code. Here is the updated patch with a new header file, dl-mman.h. OK for master? From d35367c4ac22d9873f9643018be0326b31bc2987 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 14 Oct 2015 15:14:15 -0700 Subject: [PATCH 1/2] Mark ld.so internel mmap functions hidden Since ld.so internel mmap functions are only used internally in ld.so, they can be made hidden. Don't hide __mmap on Hurd, since __mmap in ld.so will be preempted by the one in libc.so after bootstrap. [BZ #19122] * include/sys/mman.h [IS_IN (rtld)]: Include . [IS_IN (rtld)] (__mprotect): Add attribute_hidden. [IS_IN (rtld)] (__munmap): Likewise. * sysdeps/generic/dl-mman.h: New file. * sysdeps/mach/hurd/dl-mman.h: Likewise. --- include/sys/mman.h | 6 ++++++ sysdeps/generic/dl-mman.h | 18 ++++++++++++++++++ sysdeps/mach/hurd/dl-mman.h | 19 +++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 sysdeps/generic/dl-mman.h create mode 100644 sysdeps/mach/hurd/dl-mman.h diff --git a/include/sys/mman.h b/include/sys/mman.h index fd125ec..e112591 100644 --- a/include/sys/mman.h +++ b/include/sys/mman.h @@ -16,6 +16,12 @@ libc_hidden_proto (__madvise) /* This one is Linux specific. */ extern void *__mremap (void *__addr, size_t __old_len, size_t __new_len, int __flags, ...); + +# if IS_IN (rtld) +# include +extern __typeof (__mprotect) __mprotect attribute_hidden; +extern __typeof (__munmap) __munmap attribute_hidden; +# endif #endif #endif diff --git a/sysdeps/generic/dl-mman.h b/sysdeps/generic/dl-mman.h new file mode 100644 index 0000000..5b44d3a --- /dev/null +++ b/sysdeps/generic/dl-mman.h @@ -0,0 +1,18 @@ +/* Copyright (C) 2015 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 + . */ + +extern __typeof (__mmap) __mmap attribute_hidden; diff --git a/sysdeps/mach/hurd/dl-mman.h b/sysdeps/mach/hurd/dl-mman.h new file mode 100644 index 0000000..8821da5 --- /dev/null +++ b/sysdeps/mach/hurd/dl-mman.h @@ -0,0 +1,19 @@ +/* Copyright (C) 2015 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 + . */ + +/* Can't hide __mmap on Hurd, since __mmap in ld.so will be preempted by + the one in libc.so after bootstrap. */ -- 2.4.3