aboutsummaryrefslogtreecommitdiff
path: root/debug
diff options
context:
space:
mode:
authorJoan Bruguera <joanbrugueram@gmail.com>2022-04-11 19:49:56 +0200
committerSiddhesh Poyarekar <siddhesh@sourceware.org>2022-04-25 17:37:17 +0530
commitc8ee1c85c07b3c9eaef46355cb1095300855e8fa (patch)
treeddced20b9055bfa44c297bb5d4ffa555a9106595 /debug
parent499a60179657d2945c6ad01bdac90e8427a6310e (diff)
downloadglibc-c8ee1c85c07b3c9eaef46355cb1095300855e8fa.zip
glibc-c8ee1c85c07b3c9eaef46355cb1095300855e8fa.tar.gz
glibc-c8ee1c85c07b3c9eaef46355cb1095300855e8fa.tar.bz2
misc: Fix rare fortify crash on wchar funcs. [BZ 29030]
If `__glibc_objsize (__o) == (size_t) -1` (i.e. `__o` is unknown size), fortify checks should pass, and `__whatever_alias` should be called. Previously, `__glibc_objsize (__o) == (size_t) -1` was explicitly checked, but on commit a643f60c53876b, this was moved into `__glibc_safe_or_unknown_len`. A comment says the -1 case should work as: "The -1 check is redundant because since it implies that __glibc_safe_len_cond is true.". But this fails when: * `__s > 1` * `__osz == -1` (i.e. unknown size at compile time) * `__l` is big enough * `__l * __s <= __osz` can be folded to a constant (I only found this to be true for `mbsrtowcs` and other functions in wchar2.h) In this case `__l * __s <= __osz` is false, and `__whatever_chk_warn` will be called by `__glibc_fortify` or `__glibc_fortify_n` and crash the program. This commit adds the explicit `__osz == -1` check again. moc crashes on startup due to this, see: https://bugs.archlinux.org/task/74041 Minimal test case (test.c): #include <wchar.h> int main (void) { const char *hw = "HelloWorld"; mbsrtowcs (NULL, &hw, (size_t)-1, NULL); return 0; } Build with: gcc -O2 -Wp,-D_FORTIFY_SOURCE=2 test.c -o test && ./test Output: *** buffer overflow detected ***: terminated Fixes: BZ #29030 Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com> Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org> (cherry picked from commit 33e03f9cd2be4f2cd62f93fda539cc07d9c8130e)
Diffstat (limited to 'debug')
-rw-r--r--debug/tst-fortify.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/debug/tst-fortify.c b/debug/tst-fortify.c
index d65a2fe..03c9867 100644
--- a/debug/tst-fortify.c
+++ b/debug/tst-fortify.c
@@ -1504,6 +1504,11 @@ do_test (void)
CHK_FAIL_END
#endif
+ /* Bug 29030 regresion check */
+ cp = "HelloWorld";
+ if (mbsrtowcs (NULL, &cp, (size_t)-1, &s) != 10)
+ FAIL ();
+
cp = "A";
if (mbstowcs (wenough, cp, 10) != 1
|| wcscmp (wenough, L"A") != 0)