From 168b0427b92158d7cb6a23c999bf146a2dbd7aae Mon Sep 17 00:00:00 2001 From: Paul Pluzhnikov Date: Sat, 1 Sep 2018 10:50:41 -0700 Subject: [PATCH] BZ #20544 assert on NULL fn in atexit, etc. --- ChangeLog | 8 ++++ stdlib/Makefile | 2 +- stdlib/cxa_atexit.c | 4 ++ stdlib/on_exit.c | 5 +++ stdlib/tst-bz20544.c | 99 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 stdlib/tst-bz20544.c diff --git a/ChangeLog b/ChangeLog index 75e1b17cfa..18793ee116 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2018-11-28 Paul Pluzhnikov + + [BZ #20544] + * stdlib/cxa_atexit.c (__internal_atexit): assert func != NULL. + * stdlib/on_exit.c (__on_exit): Likewise. + * stdlib/Makefile (tests): Add tst-bz20544. + * stdlib/tst-bz20544.c: New test. + 2018-11-28 Florian Weimer support: Add signal support to support_capture_subprocess_check. diff --git a/stdlib/Makefile b/stdlib/Makefile index 98dbddc43c..8bce89fffe 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -87,7 +87,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ tst-makecontext-align test-bz22786 tst-strtod-nan-sign \ tst-swapcontext1 tst-setcontext4 tst-setcontext5 \ tst-setcontext6 tst-setcontext7 tst-setcontext8 \ - tst-setcontext9 + tst-setcontext9 tst-bz20544 tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \ tst-tls-atexit tst-tls-atexit-nodelete diff --git a/stdlib/cxa_atexit.c b/stdlib/cxa_atexit.c index 6d65f7e615..c1f146bfee 100644 --- a/stdlib/cxa_atexit.c +++ b/stdlib/cxa_atexit.c @@ -36,6 +36,10 @@ __internal_atexit (void (*func) (void *), void *arg, void *d, { struct exit_function *new; + /* As a QoI issue we detect NULL early with an assertion instead + of a SIGSEGV at program exit when the handler is run. BZ#20544 */ + assert (func != NULL); + __libc_lock_lock (__exit_funcs_lock); new = __new_exitfn (listp); diff --git a/stdlib/on_exit.c b/stdlib/on_exit.c index 5241e0d86f..a8be62c513 100644 --- a/stdlib/on_exit.c +++ b/stdlib/on_exit.c @@ -15,6 +15,7 @@ License along with the GNU C Library; if not, see . */ +#include #include #include "exit.h" #include @@ -25,6 +26,10 @@ __on_exit (void (*func) (int status, void *arg), void *arg) { struct exit_function *new; + /* As a QoI issue we detect NULL early with an assertion instead + of a SIGSEGV at program exit when the handler is run. BZ#20544 */ + assert (func != NULL); + __libc_lock_lock (__exit_funcs_lock); new = __new_exitfn (&__exit_funcs); diff --git a/stdlib/tst-bz20544.c b/stdlib/tst-bz20544.c new file mode 100644 index 0000000000..98fe199eac --- /dev/null +++ b/stdlib/tst-bz20544.c @@ -0,0 +1,99 @@ +/* Verify atexit, on_exit, etc. abort on NULL function pointer. + Copyright (C) 2018 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 + . */ + + +#include +#include +#include +#include +#include +#include +#include + +extern int __cxa_atexit (void (*func) (void *), void *arg, void *d); + +#pragma GCC diagnostic ignored "-Wnonnull" + +#ifndef NDEBUG +static void +do_test_bz20544_atexit (void *closure) +{ + atexit (NULL); /* Should assert. */ + exit (EXIT_FAILURE); +} + +static void +do_test_bz20544_on_exit (void *closure) +{ + on_exit (NULL, NULL); /* Should assert. */ + exit (EXIT_FAILURE); +} + +static void +do_test_bz20544_cxa_atexit (void *closure) +{ + __cxa_atexit (NULL, NULL, NULL); /* Should assert. */ + exit (EXIT_FAILURE); +} +#endif + +static int +do_test (void) +{ +#if defined(NDEBUG) + FAIL_UNSUPPORTED("Assertions disabled (NDEBUG). " + "Can't verify that assertions fire."); +#else + { + struct support_capture_subprocess result; + result = support_capture_subprocess (do_test_bz20544_atexit, NULL); + support_capture_subprocess_check (&result, "bz20544", -SIGABRT, + sc_allow_stderr); + TEST_COMPARE_STRING (result.err.buffer, + "tst-bz20544: cxa_atexit.c:41: __internal_atexit: " \ + "Assertion `func != NULL' failed.\n"); + support_capture_subprocess_free (&result); + } + + { + struct support_capture_subprocess result; + result = support_capture_subprocess (do_test_bz20544_on_exit, NULL); + support_capture_subprocess_check (&result, "bz20544", -SIGABRT, + sc_allow_stderr); + TEST_COMPARE_STRING (result.err.buffer, + "tst-bz20544: on_exit.c:31: __on_exit: " \ + "Assertion `func != NULL' failed.\n"); + support_capture_subprocess_free (&result); + } + + { + struct support_capture_subprocess result; + result = support_capture_subprocess (do_test_bz20544_cxa_atexit, NULL); + support_capture_subprocess_check (&result, "bz20544", -SIGABRT, + sc_allow_stderr); + TEST_COMPARE_STRING (result.err.buffer, + "tst-bz20544: cxa_atexit.c:41: __internal_atexit: " \ + "Assertion `func != NULL' failed.\n"); + support_capture_subprocess_free (&result); + } +#endif /* NDEBUG */ + + return 0; +} + +#include -- 2.20.0.rc1.387.gf8505762e3-goog