Avoid use of strlen in getlogin_r (bug 22447).

Building glibc with current mainline GCC fails, among other reasons,
because of an error for use of strlen on the nonstring ut_user field.
This patch changes the problem code in getlogin_r to use __strnlen
instead.  It also needs to set the trailing NUL byte of the result
explicitly, because of the case where ut_user does not have such a
trailing NUL byte (but the result should always have one).

Tested for x86_64.  Also tested that, in conjunction with
<https://sourceware.org/ml/libc-alpha/2017-11/msg00797.html>, it fixes
the build for arm with mainline GCC.

	[BZ #22447]
	* sysdeps/unix/getlogin_r.c (__getlogin_r): Use __strnlen not
	strlen to compute length of ut_user and set trailing NUL byte of
	result explicitly.

diff --git a/ChangeLog b/ChangeLog
index 64a8d9c8eaac7edfaf16d42fbc04f747e56c19d5..013d1e47e59382944ab9dd93513c6997209879fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-11-22  Joseph Myers  <joseph@codesourcery.com>
+
+       [BZ #22447]
+       * sysdeps/unix/getlogin_r.c (__getlogin_r): Use __strnlen not
+       strlen to compute length of ut_user and set trailing NUL byte of
+       result explicitly.
+
 2017-11-21  Mike FABIAN  <mfabian@redhat.com>
 
        [BZ #15537]

diff --git a/sysdeps/unix/getlogin_r.c b/sysdeps/unix/getlogin_r.c
index 4a6a40eeb2d67e7f6a461c056126589235ba9cbf..ad8e9111f6aa7beed532d94229eb9872860e40e9 100644 (file)
--- a/sysdeps/unix/getlogin_r.c
+++ b/sysdeps/unix/getlogin_r.c
@@ -80,7 +80,7 @@ __getlogin_r (char *name, size_t name_len)
 
   if (result == 0)
     {
-      size_t needed = strlen (ut->ut_user) + 1;
+      size_t needed = __strnlen (ut->ut_user, UT_NAMESIZE) + 1;
 
       if (needed > name_len)
        {
@@ -89,7 +89,8 @@ __getlogin_r (char *name, size_t name_len)
        }
       else
        {
-         memcpy (name, ut->ut_user, needed);
+         memcpy (name, ut->ut_user, needed - 1);
+         name[needed - 1] = 0;
          result = 0;
        }
     }