diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-01-04 22:05:00 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-01-04 22:05:00 +0000 |
| commit | 0e4ea7835ee33dedf72e7e917fdb7b489f8b8548 (patch) | |
| tree | 7b0c347b23ac76fca767d5cd8c65cf44e97eae9d /lib | |
| parent | ae7cc6c9f80cba5dea408c1a42172081366d8938 (diff) | |
| download | src-0e4ea7835ee33dedf72e7e917fdb7b489f8b8548.tar.gz src-0e4ea7835ee33dedf72e7e917fdb7b489f8b8548.zip | |
libssp: fix FORTIFY_SOURCE stub declarations
The LSB 4.1 that I referenced omitted the varargs, and I failed to catch it.
The __vsnprintf_chk error was from just downright misreading the page. GCC6
caught all of these, but I had only tested GCC4.2.
X-MFC-With: r356356
Notes
Notes:
svn path=/head/; revision=356358
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssp/fortify_stubs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libssp/fortify_stubs.c b/lib/libssp/fortify_stubs.c index f68b07f1de9c..32dc4b25c58b 100644 --- a/lib/libssp/fortify_stubs.c +++ b/lib/libssp/fortify_stubs.c @@ -38,15 +38,15 @@ void *__memcpy_chk(void *dst, const void *src, size_t len, size_t dstlen); void *__memset_chk(void *dst, int c, size_t len, size_t dstlen); int __snprintf_chk(char *str, size_t maxlen, int flag, size_t strlen, - const char *fmt); -int __sprintf_chk(char *str, int flag, size_t strlen, const char *fmt); + const char *fmt, ...); +int __sprintf_chk(char *str, int flag, size_t strlen, const char *fmt, ...); char *__stpcpy_chk(char *dst, const char *src, size_t dstlen); char *__strcat_chk(char *dst, const char *src, size_t dstlen); char *__strcpy_chk(char *dst, const char *src, size_t dstlen); char *__strncat_chk(char *dst, const char *src, size_t len, size_t dstlen); char *__strncpy_chk(char *dst, const char *src, size_t len, size_t dstlen); -int __vsnprintf_chk(char *str, size_t size, const char *format, - va_list ap); +int __vsnprintf_chk(char *str, size_t size, int flags, size_t len, + const char *format, va_list ap); int __vsprintf_chk(char *str, int flag, size_t slen, const char *format, va_list ap); @@ -69,14 +69,14 @@ __memset_chk(void *dst, int c, size_t len, size_t dstlen) int __snprintf_chk(char *str, size_t maxlen, int flag, size_t strlen, - const char *fmt) + const char *fmt, ...) { ABORT(); } int -__sprintf_chk(char *str, int flag, size_t strlen, const char *fmt) +__sprintf_chk(char *str, int flag, size_t strlen, const char *fmt, ...) { ABORT(); @@ -118,8 +118,8 @@ __strncpy_chk(char *dst, const char *src, size_t len, size_t dstlen) } int -__vsnprintf_chk(char *str, size_t size, const char *format, - va_list ap) +__vsnprintf_chk(char *str, size_t size, int flags, size_t len, + const char *format, va_list ap) { ABORT(); |