Backport: debug: Add regression tests for BZ 30932
Resolves: RHEL-46761
This commit is contained in:
Frédéric Bérat
parent
dac4e2b164
commit
835c6731c5
120
glibc-RHEL-46761-5.patch
Normal file
120
glibc-RHEL-46761-5.patch
Normal file
@ -0,0 +1,120 @@
|
||||
commit be7a5468d4f694ee8d052b537141f51af43ca7f2
|
||||
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
||||
Date: Tue Oct 3 15:09:36 2023 -0300
|
||||
|
||||
debug: Add regression tests for BZ 30932
|
||||
|
||||
Checked on x86_64-linux-gnu.
|
||||
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
||||
|
||||
Conflicts:
|
||||
debug/Makefile (fixup context)
|
||||
|
||||
diff --git a/debug/Makefile b/debug/Makefile
|
||||
index 563e6249121e8bc9..ab49346698116fc6 100644
|
||||
--- a/debug/Makefile
|
||||
+++ b/debug/Makefile
|
||||
@@ -110,6 +110,7 @@ CPPFLAGS-tst-longjmp_chk2.c += -D_FORTIFY_SOURCE=1
|
||||
CFLAGS-tst-longjmp_chk3.c += -fexceptions -fasynchronous-unwind-tables
|
||||
CPPFLAGS-tst-longjmp_chk3.c += -D_FORTIFY_SOURCE=1
|
||||
CPPFLAGS-tst-realpath-chk.c += -D_FORTIFY_SOURCE=2
|
||||
+CFLAGS-tst-sprintf-fortify-rdonly.c += -D_FORTIFY_SOURCE=2
|
||||
|
||||
# _FORTIFY_SOURCE tests.
|
||||
# Auto-generate tests for _FORTIFY_SOURCE for different levels, compilers and
|
||||
@@ -203,6 +204,7 @@ tests = backtrace-tst \
|
||||
tst-backtrace5 \
|
||||
tst-backtrace6 \
|
||||
tst-realpath-chk \
|
||||
+ tst-sprintf-fortify-rdonly \
|
||||
tst-sprintf-fortify-unchecked \
|
||||
$(tests-all-chk) \
|
||||
|
||||
diff --git a/debug/tst-sprintf-fortify-rdonly.c b/debug/tst-sprintf-fortify-rdonly.c
|
||||
new file mode 100644
|
||||
index 0000000000000000..78dece9102d7dfd3
|
||||
--- /dev/null
|
||||
+++ b/debug/tst-sprintf-fortify-rdonly.c
|
||||
@@ -0,0 +1,82 @@
|
||||
+/* Testcase for BZ 30932.
|
||||
+ Copyright (C) 2023 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
|
||||
+ <https://www.gnu.org/licenses/>. */
|
||||
+
|
||||
+#include <errno.h>
|
||||
+#include <setjmp.h>
|
||||
+#include <stdbool.h>
|
||||
+#include <stdio.h>
|
||||
+#include <string.h>
|
||||
+#include <sys/resource.h>
|
||||
+#include <unistd.h>
|
||||
+
|
||||
+#include <support/check.h>
|
||||
+#include <support/support.h>
|
||||
+#include <support/temp_file.h>
|
||||
+
|
||||
+jmp_buf chk_fail_buf;
|
||||
+bool chk_fail_ok;
|
||||
+
|
||||
+const char *str2 = "F";
|
||||
+char buf2[10] = "%s";
|
||||
+
|
||||
+static int
|
||||
+do_test (void)
|
||||
+{
|
||||
+ struct rlimit rl;
|
||||
+ int max_fd = 24;
|
||||
+
|
||||
+ if (getrlimit (RLIMIT_NOFILE, &rl) == -1)
|
||||
+ FAIL_EXIT1 ("getrlimit (RLIMIT_NOFILE): %m");
|
||||
+
|
||||
+ max_fd = (rl.rlim_cur < max_fd ? rl.rlim_cur : max_fd);
|
||||
+ rl.rlim_cur = max_fd;
|
||||
+
|
||||
+ if (setrlimit (RLIMIT_NOFILE, &rl) == 1)
|
||||
+ FAIL_EXIT1 ("setrlimit (RLIMIT_NOFILE): %m");
|
||||
+
|
||||
+ /* Exhaust the file descriptor limit with temporary files. */
|
||||
+ int nfiles = 0;
|
||||
+ for (; nfiles < max_fd; nfiles++)
|
||||
+ {
|
||||
+ int fd = create_temp_file ("tst-sprintf-fortify-rdonly-.", NULL);
|
||||
+ if (fd == -1)
|
||||
+ {
|
||||
+ if (errno != EMFILE)
|
||||
+ FAIL_EXIT1 ("create_temp_file: %m");
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ TEST_VERIFY_EXIT (nfiles != 0);
|
||||
+
|
||||
+ /* When the format string is writable and contains %n,
|
||||
+ with -D_FORTIFY_SOURCE=2 it causes __chk_fail. However, if libc can not
|
||||
+ open procfs to check if the input format string in within a writable
|
||||
+ memory segment, the fortify version can not perform the check. */
|
||||
+ char buf[128];
|
||||
+ int n1;
|
||||
+ int n2;
|
||||
+
|
||||
+ strcpy (buf2 + 2, "%n%s%n");
|
||||
+ if (sprintf (buf, buf2, str2, &n1, str2, &n2) != 2
|
||||
+ || n1 != 1 || n2 != 2)
|
||||
+ FAIL_EXIT1 ("sprintf failed: %s %d %d", buf, n1, n2);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+#include <support/test-driver.c>
|
||||
@ -157,7 +157,7 @@ end \
|
||||
Summary: The GNU libc libraries
|
||||
Name: glibc
|
||||
Version: %{glibcversion}
|
||||
Release: 160%{?dist}
|
||||
Release: 161%{?dist}
|
||||
|
||||
# In general, GPLv2+ is used by programs, LGPLv2+ is used for
|
||||
# libraries.
|
||||
@ -1092,6 +1092,7 @@ Patch784: glibc-RHEL-46761-3.patch
|
||||
Patch785: glibc-RHEL-46761-4.patch
|
||||
Patch786: glibc-RHEL-75810-2.patch
|
||||
Patch787: glibc-RHEL-75810-3.patch
|
||||
Patch788: glibc-RHEL-46761-5.patch
|
||||
|
||||
##############################################################################
|
||||
# Continued list of core "glibc" package information:
|
||||
@ -3085,6 +3086,9 @@ update_gconv_modules_cache ()
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jan 28 2025 Frédéric Bérat <fberat@redhat.com> - 2.34-161
|
||||
- Backport: debug: Add regression tests for BZ 30932 (RHEL-46761)
|
||||
|
||||
* Mon Jan 27 2025 Florian Weimer <fweimer@redhat.com> - 2.34-160
|
||||
- Rebuild with gcc-11.5.0-2.el9 (RHEL-76359)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user