This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Implement strlcat [BZ#178]
- From: Florian Weimer <fweimer at redhat dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Tue, 24 Nov 2015 15:30:10 +0100
- Subject: [PATCH] Implement strlcat [BZ#178]
- Authentication-results: sourceware.org; auth=none
This shouldn't be a surprise after the strlcpy patch. I tried to align
the implementation with the published specifications. The prototype
again follows FreeBSD (which has the restrict qualifiers).
Florian
2015-11-24 Florian Weimer <fweimer@redhat.com>
[BZ #178]
* string/Makefile (routines): Add strlcat.
(tests): Add tst-strlcat.
* string/Version (2.23): Exprt strlcat.
* string/strlcat.c (strlcat): New file.
* string/tst-strlcat.c: Likewise.
* include/string.h (strlcat): Declare as hidden.
* manual/string.texi (Copying and Concatenation): Document
strlcat.
* debug/Makefile (routines): Add strlcat_chk.
* debug/Versions (2.21): Export __strlcat_chk.
* debug/strlcat_chk.c: New file.
* debug/tst-chk1.c (doit): Test strlcat.
* sysdeps/*/libc.abilist: Add strlcat, __strlcat_chk.
diff --git a/NEWS b/NEWS
index aa2fef5..9f1632b 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,7 @@ Version 2.23
19074, 19076, 19077, 19078, 19079, 19085, 19086, 19088, 19094, 19095,
19124, 19125, 19129, 19134, 19137, 19156, 19174, 19181.
-* The GNU C Library now includes an implementation of strlcpy.
+* The GNU C Library now includes implementations of strlcpy and strlcat.
* A defect in the malloc implementation, present since glibc 2.15 (2012) or
glibc 2.10 via --enable-experimental-malloc (2009), could result in the
diff --git a/debug/Makefile b/debug/Makefile
index f6cebab..6bda09a 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -30,7 +30,7 @@ headers := execinfo.h
routines = backtrace backtracesyms backtracesymsfd noophooks \
memcpy_chk memmove_chk mempcpy_chk memset_chk stpcpy_chk \
strcat_chk strcpy_chk strncat_chk strncpy_chk stpncpy_chk \
- strlcpy_chk \
+ strlcpy_chk strlcat_chk \
sprintf_chk vsprintf_chk snprintf_chk vsnprintf_chk \
printf_chk fprintf_chk vprintf_chk vfprintf_chk \
gets_chk chk_fail readonly-area fgets_chk fgets_u_chk \
diff --git a/debug/Versions b/debug/Versions
index 60a7aed..8d807a2 100644
--- a/debug/Versions
+++ b/debug/Versions
@@ -57,6 +57,7 @@ libc {
}
GLIBC_2.23 {
__strlcpy_chk;
+ __strlcat_chk;
}
GLIBC_PRIVATE {
__fortify_fail;
diff --git a/debug/strlcat_chk.c b/debug/strlcat_chk.c
new file mode 100644
index 0000000..f84acee
--- /dev/null
+++ b/debug/strlcat_chk.c
@@ -0,0 +1,32 @@
+/* Fortified version of strlcat.
+ 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <string.h>
+#include <memcopy.h>
+
+/* Check that the user-supplied size does not exceed the
+ compiler-determined size, and then forward to strlcat. */
+size_t
+__strlcat_chk (char *__restrict s1, const char *__restrict s2,
+ size_t n, size_t s1len)
+{
+ if (__glibc_unlikely (s1len < n))
+ __chk_fail ();
+
+ return strlcat (s1, s2, n);
+}
diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c
index 0805a85..b9c613e 100644
--- a/debug/tst-chk1.c
+++ b/debug/tst-chk1.c
@@ -442,6 +442,11 @@ do_test (void)
CHK_FAIL_START
strncat (a.buf1, "ZYXWV", l0 + 3);
CHK_FAIL_END
+
+ buf[0] = '\0';
+ CHK_FAIL_START
+ strlcat (buf, "ZYXWV", sizeof (buf) + 1);
+ CHK_FAIL_END
#endif
diff --git a/include/string.h b/include/string.h
index 82413af..2b3f054 100644
--- a/include/string.h
+++ b/include/string.h
@@ -74,6 +74,7 @@ libc_hidden_proto (__mempcpy)
libc_hidden_proto (__stpcpy)
libc_hidden_proto (__stpncpy)
libc_hidden_proto (strlcpy)
+libc_hidden_proto (strlcat)
libc_hidden_proto (__rawmemchr)
libc_hidden_proto (__strcasecmp)
libc_hidden_proto (__strcasecmp_l)
diff --git a/manual/string.texi b/manual/string.texi
index 9a64f2e..65f50f9 100644
--- a/manual/string.texi
+++ b/manual/string.texi
@@ -1083,6 +1083,38 @@ hello, wo
@comment string.h
@comment BSD
+@deftypefun size_t strlcat (char *restrict @var{to}, const char *restrict @var{from}, size_t @var{size})
+@safety{@prelim{}@mtsafe{}@assafe{}@acsafe{}}
+This function appends the null-terminated string @var{from} to the
+string @var{to}, limiting the total length of the result string at
+@var{to} (including the null terminator) to @var{size}.
+
+If the original string @var{to} contains a null terminator among the
+first @var{size} characters, @code{strlcat} copies as much as possible
+of the string @var{from} into the buffer at @var{to} of @var{size}
+characters, starting at the terminating null character of the original
+string @var{to}. In effect, this appends the string @var{from} to the
+string @var{to}. In this case, the resulting string in @var{to} will
+always be null-terminated, and it is truncated if necessary (not all
+characters in @var{from} are copied). @code{strlcat} still returns the
+length of the untruncated string, the sum of the original length of
+@var{to} and the length of @var{from}.
+
+If the original string @var{to} is not null-terminated (within the first
+@var{size} characters of the buffer), @code{strlcat} returns @var{size}
+plus the length of the string @var{from}. In this case, the string
+@var{to} is unchanged, and will not be null-terminated. This also
+covers the case when @var{size} is zero.
+
+@strong{Note:} GNU programs should not use statically sized buffers for
+storing strings. @xref{Semantics, , Writing Robust Programs, standards,
+The GNU Coding Standards}. Instead of using @code{strlcat}, it is
+usually better to use dynamic memory allocation (@pxref{Unconstrained
+Allocation}) and and the @code{asprintf} function to construct strings.
+@end deftypefun
+
+@comment string.h
+@comment BSD
@deftypefun void bcopy (const void *@var{from}, void *@var{to}, size_t @var{size})
@safety{@prelim{}@mtsafe{}@assafe{}@acsafe{}}
This is a partially obsolete alternative for @code{memmove}, derived from
diff --git a/string/Makefile b/string/Makefile
index 0d1fb52..df13339 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -41,7 +41,7 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \
addsep replace) \
envz basename \
strcoll_l strxfrm_l string-inlines memrchr \
- xpg-strerror strerror_l strlcpy
+ xpg-strerror strerror_l strlcpy strlcat
strop-tests := memchr memcmp memcpy memmove mempcpy memset memccpy \
stpcpy stpncpy strcat strchr strcmp strcpy strcspn \
@@ -54,7 +54,7 @@ tests := tester inl-tester noinl-tester testcopy test-ffs \
tst-strtok tst-strxfrm bug-strcoll1 tst-strfry \
bug-strtok1 $(addprefix test-,$(strop-tests)) \
bug-envz1 tst-strxfrm2 tst-endian tst-svc2 \
- tst-strtok_r bug-strcoll2 tst-strlcpy
+ tst-strtok_r bug-strcoll2 tst-strlcpy tst-strlcat
xtests = tst-strcoll-overflow
diff --git a/string/Versions b/string/Versions
index bd00ca1..92804b7 100644
--- a/string/Versions
+++ b/string/Versions
@@ -82,5 +82,6 @@ libc {
}
GLIBC_2.23 {
strlcpy;
+ strlcat;
}
}
diff --git a/string/bits/string3.h b/string/bits/string3.h
index 9f28a73..27815dd 100644
--- a/string/bits/string3.h
+++ b/string/bits/string3.h
@@ -41,6 +41,7 @@ __warndecl (__warn_memset_zero_len,
# endif
# ifdef __USE_MISC
# undef strlcpy
+# undef strlcat
# undef bcopy
# undef bzero
# endif
@@ -181,4 +182,28 @@ __NTH (strlcpy (char *__restrict __dest, const char *__restrict __src,
return strlcpy (__dest, __src, __len);
return __strlcpy_chk (__dest, __src, __len, __bos (__dest));
}
+
+__warndecl (__warn_strlcat_size_zero,
+ "strlcat used with a size argument of zero");
+__warndecl (__warn_strlcat_size_large,
+ "strlcat used with a size argument which is too large");
+extern size_t __strlcat_chk (char *__dest, const char *__src, size_t __n,
+ size_t __destlen) __THROW;
+
+__fortify_function size_t
+__NTH (strlcat (char *__restrict __dest, const char *__restrict __src,
+ size_t __len))
+{
+ if (__builtin_constant_p (__len == 0) && __len == 0)
+ {
+ __warn_strlcat_size_zero ();
+ return strlen (__src);
+ }
+ if (__builtin_constant_p (__len > __bos (__dest)) && __len > __bos (__dest))
+ __warn_strlcat_size_large ();
+ if (__builtin_constant_p (__bos (__dest) == (size_t) -1)
+ && __bos (__dest) == (size_t) -1)
+ return strlcat (__dest, __src, __len);
+ return __strlcat_chk (__dest, __src, __len, __bos (__dest));
+}
#endif
diff --git a/string/string.h b/string/string.h
index 6f5ed26..2f80810 100644
--- a/string/string.h
+++ b/string/string.h
@@ -579,6 +579,11 @@ extern char *stpncpy (char *__restrict __dest,
extern size_t strlcpy (char *__restrict __dest,
const char *__restrict __src, size_t __n)
__THROW __nonnull ((1, 2));
+
+/* Append SRC to DEST, truncating to keep the total size below N. */
+extern size_t strlcat (char *__restrict __dest,
+ const char *__restrict __src, size_t __n)
+ __THROW __nonnull ((1, 2));
#endif
#ifdef __USE_GNU
diff --git a/string/strlcat.c b/string/strlcat.c
new file mode 100644
index 0000000..1ecf877
--- /dev/null
+++ b/string/strlcat.c
@@ -0,0 +1,48 @@
+/* Append a null-terminated string to another string, with length checking.
+ 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <string.h>
+
+#undef strlcat
+
+size_t
+strlcat (char *__restrict dest, const char *__restrict src, size_t size)
+{
+ size_t dest_length = __strnlen (dest, size);
+ size_t src_length = strlen (src);
+
+ if (dest_length != size)
+ {
+ /* Copy at most the remaining number of characters in the
+ destination buffer. Leave for the NUL terminator. */
+ size_t to_copy = size - dest_length - 1;
+ /* But not more than what is available in the source string. */
+ if (to_copy > src_length)
+ to_copy = src_length;
+
+ char *target = dest + dest_length;
+ memcpy (target, src, to_copy);
+ target[to_copy] = '\0';
+ }
+
+ /* The sum cannot wrap around because both strings would be larger
+ than half of the address space, which is not possible due to
+ the restrict qualifier. */
+ return dest_length + src_length;
+}
+libc_hidden_def (strlcat)
diff --git a/string/tst-strlcat.c b/string/tst-strlcat.c
new file mode 100644
index 0000000..117107d
--- /dev/null
+++ b/string/tst-strlcat.c
@@ -0,0 +1,92 @@
+/* Test the strlcat function.
+ 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#define CHECK(cond) \
+ if (!(cond)) \
+ { \
+ printf ("%s:%d: FAIL\n", __FILE__, __LINE__); \
+ exit (1); \
+ }
+
+static int
+do_test (void)
+{
+ struct {
+ char buf1[16];
+ char buf2[16];
+ } s;
+
+ /* Nothing is written to the destination if its size is 0. */
+ memset (&s, '@', sizeof (s));
+ CHECK (strlcat (s.buf1, "", 0) == 0);
+ CHECK (memcmp (&s, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", sizeof (s)) == 0);
+ CHECK (strlcat (s.buf1, "Hello!", 0) == 6);
+ CHECK (memcmp (&s, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", sizeof (s)) == 0);
+
+ /* No bytes are are modified in the target buffer if the source
+ string is short enough. */
+ memset (&s, '@', sizeof (s));
+ strcpy (s.buf1, "He");
+ CHECK (strlcat (s.buf1, "llo!", sizeof (s.buf1)) == 6);
+ CHECK (memcmp (&s, "Hello!\0@@@@@@@@@@@@@@@@@@@@@@@@@", sizeof (s)) == 0);
+
+ /* A source string which fits exactly into the destination buffer is
+ not truncated. */
+ memset (&s, '@', sizeof (s));
+ strcpy (s.buf1, "H");
+ CHECK (strlcat (s.buf1, "ello, world!!!", sizeof (s.buf1)) == 15);
+ CHECK (memcmp (&s, "Hello, world!!!\0@@@@@@@@@@@@@@@@@@@@@@@@@",
+ sizeof (s)) == 0);
+
+ /* A source string one character longer than the destination buffer
+ is truncated by one character. The total length is returned. */
+ memset (&s, '@', sizeof (s));
+ strcpy (s.buf1, "Hello");
+ CHECK (strlcat (s.buf1, ", world!!!!", sizeof (s.buf1)) == 16);
+ CHECK (memcmp (&s, "Hello, world!!!\0@@@@@@@@@@@@@@@@@@@@@@@@@",
+ sizeof (s)) == 0);
+
+ /* An even longer source string is truncated as well, and the total
+ length is returned. */
+ memset (&s, '@', sizeof (s));
+ strcpy (s.buf1, "Hello,");
+ CHECK (strlcat (s.buf1, " world!!!!!!!!", sizeof (s.buf1)) == 20);
+ CHECK (memcmp (&s, "Hello, world!!!\0@@@@@@@@@@@@@@@@@@@@@@@@@",
+ sizeof (s)) == 0);
+
+ /* A destination string which is not NUL-terminated does not result
+ in any changes to the buffer. */
+ memset (&s, '@', sizeof (s));
+ memset (s.buf1, '$', sizeof (s.buf1));
+ CHECK (strlcat (s.buf1, "", sizeof (s.buf1)) == 16);
+ CHECK (memcmp (&s, "$$$$$$$$$$$$$$$$@@@@@@@@@@@@@@@@", sizeof (s)) == 0);
+ CHECK (strlcat (s.buf1, "Hello!", sizeof (s.buf1)) == 22);
+ CHECK (memcmp (&s, "$$$$$$$$$$$$$$$$@@@@@@@@@@@@@@@@", sizeof (s)) == 0);
+ CHECK (strlcat (s.buf1, "Hello, world!!!!!!!!", sizeof (s.buf1)) == 36);
+ CHECK (memcmp (&s, "$$$$$$$$$$$$$$$$@@@@@@@@@@@@@@@@", sizeof (s)) == 0);
+
+ return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
+
diff --git a/sysdeps/arm/nacl/libc.abilist b/sysdeps/arm/nacl/libc.abilist
index 9137c51..ccf8d04 100644
--- a/sysdeps/arm/nacl/libc.abilist
+++ b/sysdeps/arm/nacl/libc.abilist
@@ -1835,5 +1835,7 @@ GLIBC_2.22 write F
GLIBC_2.22 writev F
GLIBC_2.22 wscanf F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 62c6412..6a81bed 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -2082,5 +2082,7 @@ GLIBC_2.18 _mcount F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index e5bff7e..d6a3fe4 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1993,7 +1993,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/arm/libc.abilist b/sysdeps/unix/sysv/linux/arm/libc.abilist
index 5e7f8e9..2ddf8f6 100644
--- a/sysdeps/unix/sysv/linux/arm/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/libc.abilist
@@ -83,7 +83,9 @@ GLIBC_2.18 __cxa_thread_atexit_impl F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.4 GLIBC_2.4 A
GLIBC_2.4 _Exit F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index ff90320..305241c 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -1847,7 +1847,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index ecf1d72..5b91261 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -2005,7 +2005,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 8039f68..bebfdf0 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -1869,7 +1869,9 @@ GLIBC_2.2.6 getunwind F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index 8053211..bc1d9b5 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -84,7 +84,9 @@ GLIBC_2.18 __cxa_thread_atexit_impl F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.4 GLIBC_2.4 A
GLIBC_2.4 _Exit F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index d3d9863..8c852ca 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -1961,7 +1961,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/microblaze/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/libc.abilist
index 6fe3aeb..307bb7e 100644
--- a/sysdeps/unix/sysv/linux/microblaze/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/libc.abilist
@@ -2082,5 +2082,7 @@ GLIBC_2.18 xprt_unregister F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index 87de055..349edc1 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -1936,7 +1936,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index aed7e26..ce3fb85 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -1934,7 +1934,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index 06d5c94..5ef0f1d 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -1932,7 +1932,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index e06e184..7aff8d2 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -1927,7 +1927,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index c837ec4..ccd5e9e 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -2123,5 +2123,7 @@ GLIBC_2.21 xprt_unregister F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index 866c0c5..7c2094d 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -1965,7 +1965,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index 2b647f7..ef8ecb2 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -1970,7 +1970,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
index b0359b2..3d72beb 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
@@ -2170,5 +2170,7 @@ GLIBC_2.18 __cxa_thread_atexit_impl F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
index df9a5f5..357a354 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
@@ -84,7 +84,9 @@ GLIBC_2.18 __cxa_thread_atexit_impl F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 _Exit F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index 12528d0..e7a94e1 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -1965,7 +1965,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index 99d63b4..8a31191 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -1866,7 +1866,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/sh/libc.abilist b/sysdeps/unix/sysv/linux/sh/libc.abilist
index 5d7baaa..814d2c4 100644
--- a/sysdeps/unix/sysv/linux/sh/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/libc.abilist
@@ -1851,7 +1851,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index eda8cc2..25c30cc 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -1957,7 +1957,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index 9c72aaf..9053058 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -1895,7 +1895,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist b/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist
index 50bbb2d..25a8c49 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist
@@ -2089,5 +2089,7 @@ GLIBC_2.18 __cxa_thread_atexit_impl F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist b/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
index 51c87cd..7308d65 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
@@ -2089,5 +2089,7 @@ GLIBC_2.18 __cxa_thread_atexit_impl F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
diff --git a/sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist b/sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist
index 50bbb2d..25a8c49 100644
--- a/sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist
@@ -2089,5 +2089,7 @@ GLIBC_2.18 __cxa_thread_atexit_impl F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index 60e85dc..1f50eba 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -1846,7 +1846,9 @@ GLIBC_2.2.6 __nanosleep F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index 386d4b3..abb9d60 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -2089,5 +2089,7 @@ GLIBC_2.18 __cxa_thread_atexit_impl F
GLIBC_2.22 GLIBC_2.22 A
GLIBC_2.22 fmemopen F
GLIBC_2.23 GLIBC_2.23 A
+GLIBC_2.23 __strlcat_chk F
GLIBC_2.23 __strlcpy_chk F
+GLIBC_2.23 strlcat F
GLIBC_2.23 strlcpy F