From patchwork Fri Sep 1 17:59:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 808853 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-84050-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="XfCBvU7m"; dkim-atps=neutral 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 3xkRsC52Cwz9s7M for ; Sat, 2 Sep 2017 04:02:07 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=gK9hfxQtTgNadfqCh3OYgvtiDovV4Q2 1hWZVimIdkje5Baht9VFAX/eEux78dN2ve+Rp9W2aKjU66vz+zYAfwWZVgdRSFWX kKN8S0WC6tYu6bWvgb6usMDDf4/pLrqWGu3J2Si5GxfEvv/Tpiqdubxcrb4cqQCX qXDCoxNrWelw= 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:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=oaA6MUEmpdxj9Zfnbu7GNFsgafg=; b=XfCBv U7muxFQIVtRerNOLXu2dZFwH2xcsnvAH1hGv74rmcgQmBtUzr2m+ATzdCpZNUZPk omztN8ffRw1ERI6l8j1AgQQML7vw07TXMlsDIWtsw0S/vSkcajcW3B+x9dq5daO8 2NTWc2iOHjrAzF3rU1YWo6WI/KfR8OVs0ns/GE= Received: (qmail 84245 invoked by alias); 1 Sep 2017 18:00:47 -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 84031 invoked by uid 89); 1 Sep 2017 18:00:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.2 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy=H*m:gmail X-HELO: mga02.intel.com X-ExtLoop1: 1 From: "H.J. Lu" To: libc-alpha@sourceware.org Subject: [PATCH 07/58] Mark internal grp/pwd/shadow functions with attribute_hidden [BZ #18822] Date: Fri, 1 Sep 2017 10:59:38 -0700 Message-Id: <20170901180029.9527-8-hjl.tools@gmail.com> In-Reply-To: <20170901180029.9527-1-hjl.tools@gmail.com> References: <20170901180029.9527-1-hjl.tools@gmail.com> Mark internal grp/pwd/shadow functions with attribute_hidden to allow direct access within libc.so and libc.a without using GOT nor PLT. [BZ #18822] * include/grp.h (__fgetgrent_r): Add attribute_hidden. (__getgrgid_r): Likewise. (__getgrnam_r): Likewise. * include/pwd.h (__getpwuid_r): Likewise. (__getpwnam_r): Likewise. (__fgetpwent_r): Likewise. * include/shadow.h (__getspnam_r): Likewise. (__sgetspent_r): Likewise. (__fgetspent_r): Likewise. --- include/grp.h | 6 +++--- include/pwd.h | 6 +++--- include/shadow.h | 7 ++++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/grp.h b/include/grp.h index 0fb5c9a574..871701adbe 100644 --- a/include/grp.h +++ b/include/grp.h @@ -12,12 +12,12 @@ extern int __old_getgrent_r (struct group *__resultbuf, char *buffer, size_t __buflen, struct group **__result); extern int __fgetgrent_r (FILE * __stream, struct group *__resultbuf, char *buffer, size_t __buflen, - struct group **__result); + struct group **__result) attribute_hidden; /* Search for an entry with a matching group ID. */ extern int __getgrgid_r (__gid_t __gid, struct group *__resultbuf, char *__buffer, size_t __buflen, - struct group **__result); + struct group **__result) attribute_hidden; extern int __old_getgrgid_r (__gid_t __gid, struct group *__resultbuf, char *__buffer, size_t __buflen, struct group **__result); @@ -25,7 +25,7 @@ extern int __old_getgrgid_r (__gid_t __gid, struct group *__resultbuf, /* Search for an entry with a matching group name. */ extern int __getgrnam_r (const char *__name, struct group *__resultbuf, char *__buffer, size_t __buflen, - struct group **__result); + struct group **__result) attribute_hidden; extern int __old_getgrnam_r (const char *__name, struct group *__resultbuf, char *__buffer, size_t __buflen, struct group **__result); diff --git a/include/pwd.h b/include/pwd.h index 3b0f72540c..fc995065d9 100644 --- a/include/pwd.h +++ b/include/pwd.h @@ -10,19 +10,19 @@ extern int __old_getpwent_r (struct passwd *__resultbuf, char *__buffer, size_t __buflen, struct passwd **__result); extern int __getpwuid_r (__uid_t __uid, struct passwd *__resultbuf, char *__buffer, size_t __buflen, - struct passwd **__result); + struct passwd **__result) attribute_hidden; extern int __old_getpwuid_r (__uid_t __uid, struct passwd *__resultbuf, char *__buffer, size_t __buflen, struct passwd **__result); extern int __getpwnam_r (const char *__name, struct passwd *__resultbuf, char *__buffer, size_t __buflen, - struct passwd **__result); + struct passwd **__result) attribute_hidden; extern int __old_getpwnam_r (const char *__name, struct passwd *__resultbuf, char *__buffer, size_t __buflen, struct passwd **__result); extern int __fgetpwent_r (FILE * __stream, struct passwd *__resultbuf, char *__buffer, size_t __buflen, - struct passwd **__result); + struct passwd **__result) attribute_hidden; #include diff --git a/include/shadow.h b/include/shadow.h index 124a1ab50a..366ea83482 100644 --- a/include/shadow.h +++ b/include/shadow.h @@ -11,16 +11,17 @@ extern int __old_getspent_r (struct spwd *__result_buf, char *__buffer, size_t __buflen, struct spwd **__result); extern int __getspnam_r (const char *__name, struct spwd *__result_buf, char *__buffer, size_t __buflen, - struct spwd **__result); + struct spwd **__result) attribute_hidden; extern int __old_getspnam_r (const char *__name, struct spwd *__result_buf, char *__buffer, size_t __buflen, struct spwd **__result); extern int __sgetspent_r (const char *__string, struct spwd *__result_buf, char *__buffer, - size_t __buflen, struct spwd **__result); + size_t __buflen, struct spwd **__result) + attribute_hidden; extern int __fgetspent_r (FILE *__stream, struct spwd *__result_buf, char *__buffer, size_t __buflen, - struct spwd **__result); + struct spwd **__result) attribute_hidden; extern int __lckpwdf (void); extern int __ulckpwdf (void);