3 files changed, 238 insertions, 2 deletions

diff --git a/include/ssp/Makefile b/include/ssp/Makefile
index 2bbbc2eab705..725d82ff10e5 100644
--- a/include/ssp/Makefile
+++ b/include/ssp/Makefile
@@ -1,4 +1,4 @@
-INCS=	poll.h ssp.h stdio.h stdlib.h string.h strings.h unistd.h
+INCS=	poll.h ssp.h stdio.h stdlib.h string.h strings.h unistd.h wchar.h
 INCSDIR=	${INCLUDEDIR}/ssp
 
 .include <bsd.prog.mk>
diff --git a/include/ssp/wchar.h b/include/ssp/wchar.h
new file mode 100644
index 000000000000..48fc56f9d243
--- /dev/null
+++ b/include/ssp/wchar.h
@@ -0,0 +1,229 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2024, Klara, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef _SSP_WCHAR_H_
+#define _SSP_WCHAR_H_
+
+#include <ssp/ssp.h>
+
+#if __SSP_FORTIFY_LEVEL > 0
+
+static inline int
+__ssp_wchar_overlap(const void *leftp, const void *rightp, size_t len)
+{
+
+	if (len > SIZE_MAX / sizeof(wchar_t))
+		return (1);
+	return (__ssp_overlap(leftp, rightp, len * sizeof(wchar_t)));
+}
+
+/*
+ * __ssp_wbos for w*() calls where the size parameters are in sizeof(wchar_t)
+ * units, so the result needs to be scaled appropriately.
+ */
+__ssp_inline size_t
+__ssp_wbos(void *ptr)
+{
+	const size_t ptrsize = __ssp_bos(ptr);
+
+	if (ptrsize == (size_t)-1)
+		return (ptrsize);
+
+	return (ptrsize / sizeof(wchar_t));
+}
+
+__BEGIN_DECLS
+__ssp_redirect_raw_impl(wchar_t *, wmemcpy, wmemcpy,
+    (wchar_t *__restrict buf, const wchar_t *__restrict src, size_t len))
+{
+	const size_t slen = __ssp_wbos(buf);
+
+	if (len > slen)
+		__chk_fail();
+	if (__ssp_wchar_overlap(src, buf, len))
+		__chk_fail();
+
+	return (__ssp_real(wmemcpy)(buf, src, len));
+}
+
+__ssp_redirect_raw_impl(wchar_t *, wmempcpy, wmempcpy,
+    (wchar_t *__restrict buf, const wchar_t *__restrict src, size_t len))
+{
+	const size_t slen = __ssp_wbos(buf);
+
+	if (len > slen)
+		__chk_fail();
+	if (__ssp_wchar_overlap(src, buf, len))
+		__chk_fail();
+
+	return (__ssp_real(wmempcpy)(buf, src, len));
+}
+
+__ssp_redirect_raw_impl(wchar_t *, wmemmove, wmemmove,
+    (wchar_t *buf, const wchar_t *src, size_t len))
+{
+	const size_t slen = __ssp_wbos(buf);
+
+	if (len > slen)
+		__chk_fail();
+
+	return (__ssp_real(wmemmove)(buf, src, len));
+}
+
+__ssp_redirect_raw_impl(wchar_t *, wmemset, wmemset,
+    (wchar_t *buf, wchar_t c, size_t len))
+{
+	const size_t slen = __ssp_wbos(buf);
+
+	if (len > slen)
+		__chk_fail();
+	return (__ssp_real(wmemset)(buf, c, len));
+}
+
+__ssp_redirect_raw_impl(wchar_t *, wcpcpy, wcpcpy,
+    (wchar_t *__restrict buf, const wchar_t *__restrict src))
+{
+	const size_t slen = __ssp_wbos(buf);
+	const size_t len = wcslen(src);
+
+	if (len >= slen)
+		__chk_fail();
+	if (__ssp_wchar_overlap(buf, src, len))
+		__chk_fail();
+
+	(void)__ssp_real(wmemcpy)(buf, src, len + 1);
+	return (buf + len);
+}
+
+__ssp_redirect_raw_impl(wchar_t *, wcpncpy, wcpncpy,
+    (wchar_t *__restrict buf, const wchar_t *__restrict src, size_t len))
+{
+	const size_t slen = __ssp_wbos(buf);
+
+	if (len > slen)
+		__chk_fail();
+	if (__ssp_wchar_overlap(buf, src, len))
+		__chk_fail();
+
+	return (__ssp_real(wcpncpy)(buf, src, len));
+}
+
+__ssp_redirect_raw_impl(wchar_t *, wcscat, wcscat,
+   (wchar_t *__restrict buf, const wchar_t *__restrict src))
+{
+	size_t slen = __ssp_wbos(buf);
+	wchar_t *cp;
+
+	cp = buf;
+	while (*cp != L'\0') {
+		cp++;
+		if (slen-- == 0)
+			__chk_fail();
+	}
+
+	while (*src != L'\0') {
+		if (slen-- == 0)
+			__chk_fail();
+		*cp++ = *src++;
+	}
+
+	if (slen-- == 0)
+		__chk_fail();
+	*cp = '\0';
+	return (buf);
+}
+
+__ssp_redirect_raw_impl(wchar_t *, wcscpy, wcscpy,
+   (wchar_t *__restrict buf, const wchar_t *__restrict src))
+{
+	const size_t slen = __ssp_wbos(buf);
+	size_t len = wcslen(src) + 1;
+
+	if (len > slen)
+		__chk_fail();
+	if (__ssp_wchar_overlap(buf, src, len))
+		__chk_fail();
+
+	return (__ssp_real(wmemcpy)(buf, src, len));
+}
+
+__ssp_redirect_raw_impl(wchar_t *, wcsncat, wcsncat,
+    (wchar_t *__restrict buf, const wchar_t *__restrict src, size_t len))
+{
+	const size_t slen = __ssp_wbos(buf);
+
+	if (len == 0)
+		return (buf);
+	if (len > slen)
+		__chk_fail();
+	if (__ssp_wchar_overlap(buf, src, len))
+		__chk_fail();
+
+	return (__ssp_real(wcsncat)(buf, src, len));
+}
+
+__ssp_redirect_raw_impl(size_t, wcslcat, wcslcat,
+    (wchar_t *__restrict buf, const wchar_t *__restrict src, size_t len))
+{
+	const size_t slen = __ssp_wbos(buf);
+
+	if (len > slen)
+		__chk_fail();
+	if (__ssp_wchar_overlap(buf, src, len))
+		__chk_fail();
+
+	return (__ssp_real(wcslcat)(buf, src, len));
+}
+
+__ssp_redirect_raw_impl(wchar_t *, wcsncpy, wcsncpy,
+    (wchar_t *__restrict buf, const wchar_t *__restrict src, size_t len))
+{
+	const size_t slen = __ssp_wbos(buf);
+
+	if (len > slen)
+		__chk_fail();
+	if (__ssp_wchar_overlap(buf, src, len))
+		__chk_fail();
+
+	return (__ssp_real(wcsncpy)(buf, src, len));
+}
+
+__ssp_redirect_raw_impl(size_t, wcslcpy, wcslcpy,
+    (wchar_t *__restrict buf, const wchar_t *__restrict src, size_t len))
+{
+	const size_t slen = __ssp_wbos(buf);
+
+	if (len > slen)
+		__chk_fail();
+	if (__ssp_wchar_overlap(buf, src, len))
+		__chk_fail();
+
+	return (__ssp_real(wcslcpy)(buf, src, len));
+}
+__END_DECLS
+
+#endif /* __SSP_FORTIFY_LEVEL > 0 */
+#endif /* _SSP_WCHAR_H_ */
diff --git a/include/wchar.h b/include/wchar.h
index 2f23feec8792..e4b037c9b16f 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -109,6 +109,14 @@ typedef struct __sFILE FILE;
 struct tm;
 
 __BEGIN_DECLS
+size_t	wcslen(const wchar_t *) __pure;
+__END_DECLS
+
+#if !defined(_STANDALONE) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
+#include <ssp/wchar.h>
+#endif
+
+__BEGIN_DECLS
 wint_t	btowc(int);
 wint_t	fgetwc(FILE *);
 wchar_t	*
@@ -146,7 +154,6 @@ wchar_t	*wcscpy(wchar_t * __restrict, const wchar_t * __restrict);
 size_t	wcscspn(const wchar_t *, const wchar_t *) __pure;
 size_t	wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict,
 	    const struct tm * __restrict);
-size_t	wcslen(const wchar_t *) __pure;
 wchar_t	*wcsncat(wchar_t * __restrict, const wchar_t * __restrict,
 	    size_t);
 int	wcsncmp(const wchar_t *, const wchar_t *, size_t) __pure;