From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26577 invoked by alias); 4 Dec 2017 10:14:14 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 26531 invoked by uid 9642); 4 Dec 2017 10:14:14 -0000 Date: Mon, 04 Dec 2017 10:14:00 -0000 Message-ID: <20171204101414.26529.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Yaakov Selkowitz To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] ssp: add Object Size Checking for wchar.h, part 1 X-Act-Checkin: newlib-cygwin X-Git-Author: Yaakov Selkowitz X-Git-Refname: refs/heads/master X-Git-Oldrev: 08d77e5154b58d0d153e99d270f7d1907f7e160d X-Git-Newrev: 8f7c712bb8db2a811bf8b8c6628d4f83a2118cc7 X-SW-Source: 2017-q4/txt/msg00075.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=8f7c712bb8db2a811bf8b8c6628d4f83a2118cc7 commit 8f7c712bb8db2a811bf8b8c6628d4f83a2118cc7 Author: Yaakov Selkowitz Date: Fri Dec 1 12:45:14 2017 -0600 ssp: add Object Size Checking for wchar.h, part 1 The following functions are also guarded in glibc: fwprintf, swprintf, wprintf, vfwprintf, vswprintf, vwprintf. Signed-off-by: Yaakov Selkowitz Diff: --- newlib/libc/include/ssp/wchar.h | 97 +++++++++++++++++++++++++++++++++++++++++ newlib/libc/include/wchar.h | 4 ++ newlib/libc/ssp/ssp.tex | 8 ++++ 3 files changed, 109 insertions(+) diff --git a/newlib/libc/include/ssp/wchar.h b/newlib/libc/include/ssp/wchar.h new file mode 100644 index 0000000..39033cf --- /dev/null +++ b/newlib/libc/include/ssp/wchar.h @@ -0,0 +1,97 @@ +#ifndef _SSP_WCHAR_H_ +#define _SSP_WCHAR_H_ + +#include +#include + +#if __SSP_FORTIFY_LEVEL > 0 + +/* wide character variant, __wlen is number of wchar_t */ +#define __ssp_redirect_wc(rtype, fun, args, call, cond, bos) \ +__ssp_decl(rtype, fun, args) \ +{ \ + if (cond) \ + __ssp_check(__buf, __wlen * sizeof(wchar_t), bos); \ + return __ssp_real_(fun) call; \ +} + +#define __ssp_bos_wicheck3(fun) \ +__ssp_redirect_wc(wchar_t *, fun, \ + (wchar_t *__buf, const wchar_t *__src, size_t __wlen), \ + (__buf, __src, __wlen), 1, __ssp_bos0) + +#define __ssp_bos_wicheck3_restrict(fun) \ +__ssp_redirect_wc(wchar_t *, fun, \ + (wchar_t *__restrict __buf, const wchar_t *__restrict __src, size_t __wlen), \ + (__buf, __src, __wlen), 1, __ssp_bos0) + +#define __ssp_bos_wicheck2_restrict(fun) \ +__ssp_decl(wchar_t *, fun, (wchar_t *__restrict __buf, const wchar_t *__restrict __src)) \ +{ \ + __ssp_check(__buf, (wcslen(__src) + 1) * sizeof(wchar_t), __ssp_bos0); \ + return __ssp_real_(fun) (__buf, __src); \ +} + +__BEGIN_DECLS +#if __POSIX_VISIBLE >= 200809 +__ssp_bos_wicheck2_restrict(wcpcpy) +__ssp_bos_wicheck3_restrict(wcpncpy) +#endif +__ssp_bos_wicheck2_restrict(wcscpy) +__ssp_bos_wicheck2_restrict(wcscat) +__ssp_bos_wicheck3_restrict(wcsncpy) +__ssp_bos_wicheck3_restrict(wcsncat) +__ssp_bos_wicheck3_restrict(wmemcpy) +__ssp_bos_wicheck3(wmemmove) +#if __GNU_VISIBLE +__ssp_bos_wicheck3_restrict(wmempcpy) +#endif +__ssp_redirect_wc(wchar_t *, wmemset, \ + (wchar_t *__buf, wchar_t __src, size_t __wlen), \ + (__buf, __src, __wlen), 1, __ssp_bos0) + +__ssp_decl(size_t, wcrtomb, (char *__buf, wchar_t __src, mbstate_t *__ps)) +{ + if (__buf != NULL && __src != L'\0') + __ssp_check(__buf, sizeof(wchar_t), __ssp_bos); + return __ssp_real_wcrtomb (__buf, __src, __ps); +} + +__ssp_redirect_wc(size_t, mbsrtowcs, \ + (wchar_t *__buf, const char **__src, size_t __wlen, mbstate_t *__ps), \ + (__buf, __src, __wlen, __ps), __buf != NULL, __ssp_bos) + +__ssp_redirect_raw(size_t, wcsrtombs, \ + (char *__buf, const wchar_t **__src, size_t __len, mbstate_t *__ps), \ + (__buf, __src, __len, __ps), __buf != NULL, __ssp_bos) + +#if __POSIX_VISIBLE >= 200809 +__ssp_redirect_wc(size_t, mbsnrtowcs, \ + (wchar_t *__buf, const char **__src, size_t __nms, size_t __wlen, mbstate_t *__ps), \ + (__buf, __src, __nms, __wlen, __ps), __buf != NULL, __ssp_bos) + +__ssp_redirect_raw(size_t, wcsnrtombs, \ + (char *__buf, const wchar_t **__src, size_t __nwc, size_t __len, mbstate_t *__ps), \ + (__buf, __src, __nwc, __len, __ps), __buf != NULL, __ssp_bos) +#endif + +__ssp_decl(wchar_t *, fgetws, (wchar_t *__restrict __buf, int __wlen, FILE *__restrict __fp)) +{ + if (__wlen > 0) + __ssp_check(__buf, (size_t)__wlen * sizeof(wchar_t) , __ssp_bos); + return __ssp_real_fgetws(__buf, __wlen, __fp); +} + +#if __GNU_VISIBLE +__ssp_decl(wchar_t *, fgetws_unlocked, (wchar_t *__buf, int __wlen, FILE *__fp)) +{ + if (__wlen > 0) + __ssp_check(__buf, (size_t)__wlen * sizeof(wchar_t) , __ssp_bos); + return __ssp_real_fgetws_unlocked(__buf, __wlen, __fp); +} +#endif /* __GNU_VISIBLE */ + +__END_DECLS + +#endif /* __SSP_FORTIFY_LEVEL > 0 */ +#endif /* _SSP_WCHAR_H_ */ diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h index 16e28f4..dccc106 100644 --- a/newlib/libc/include/wchar.h +++ b/newlib/libc/include/wchar.h @@ -332,4 +332,8 @@ int _EXFUN(_wscanf_r, (struct _reent *, const wchar_t *, ...)); _END_STD_C +#if __SSP_FORTIFY_LEVEL > 0 +#include +#endif + #endif /* _WCHAR_H_ */ diff --git a/newlib/libc/ssp/ssp.tex b/newlib/libc/ssp/ssp.tex index 1e0cb6b..9270350 100644 --- a/newlib/libc/ssp/ssp.tex +++ b/newlib/libc/ssp/ssp.tex @@ -34,6 +34,14 @@ bzero mempcpy strcat explicit_bzero memset strncat memcpy stpcpy strncpy +@exdent @emph{Wide Character String functions:} +fgetws wcrtomb wcsrtombs +fgetws_unlocked wcscat wmemcpy +mbsnrtowcs wcscpy wmemmove +mbsrtowcs wcsncat wmempcpy +wcpcpy wcsncpy wmemset +wcpncpy wcsnrtombs + @exdent @emph{Stdio functions:} fgets fread_unlocked sprintf fgets_unlocked gets vsnprintf