This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.27/master updated. glibc-2.27-42-ga8a7d4c
- From: ldv at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 May 2018 10:28:09 -0000
- Subject: GNU C Library master sources branch release/2.27/master updated. glibc-2.27-42-ga8a7d4c
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, release/2.27/master has been updated
via a8a7d4c5d8d3a767c5cae0d327f17edb813cf6f2 (commit)
from 1a90f09f2434af7a2f8ba332ddd547d229a1e709 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a8a7d4c5d8d3a767c5cae0d327f17edb813cf6f2
commit a8a7d4c5d8d3a767c5cae0d327f17edb813cf6f2
Author: Jesse Hathaway <jesse@mbuki-mvuki.org>
Date: Tue Mar 27 21:17:59 2018 +0000
getlogin_r: return early when linux sentinel value is set
When there is no login uid Linux sets /proc/self/loginid to the sentinel
value of, (uid_t) -1. If this is set we can return early and avoid
needlessly looking up the sentinel value in any configured nss
databases.
Checked on aarch64-linux-gnu.
* sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): Return
early when linux sentinel value is set.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
(cherry picked from commit cc8a1620eb97ccddd337d157263c13c57b39ab71)
diff --git a/ChangeLog b/ChangeLog
index 89ecd49..670c6d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-27 Jesse Hathaway <jesse@mbuki-mvuki.org>
+
+ * sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): Return
+ early when linux sentinel value is set.
+
2018-03-27 Andreas Schwab <schwab@suse.de>
[BZ #23005]
diff --git a/sysdeps/unix/sysv/linux/getlogin_r.c b/sysdeps/unix/sysv/linux/getlogin_r.c
index 84c51d0..7a814ea 100644
--- a/sysdeps/unix/sysv/linux/getlogin_r.c
+++ b/sysdeps/unix/sysv/linux/getlogin_r.c
@@ -54,6 +54,15 @@ __getlogin_r_loginuid (char *name, size_t namesize)
endp == uidbuf || *endp != '\0'))
return -1;
+ /* If there is no login uid, linux sets /proc/self/loginid to the sentinel
+ value of, (uid_t) -1, so check if that value is set and return early to
+ avoid making unneeded nss lookups. */
+ if (uid == (uid_t) -1)
+ {
+ __set_errno (ENXIO);
+ return ENXIO;
+ }
+
size_t buflen = 1024;
char *buf = alloca (buflen);
bool use_malloc = false;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/getlogin_r.c | 9 +++++++++
2 files changed, 14 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources