summaryrefslogtreecommitdiffstats
path: root/ltp-20150119-diotest-format-string.patch
diff options
context:
space:
mode:
authorKen Dreyer <ktdreyer@ktdreyer.com>2015-01-26 13:54:32 -0700
committerKen Dreyer <ktdreyer@ktdreyer.com>2015-01-26 23:00:08 -0700
commitfefba6a3b1efd01e5c1a43447f8607367188d940 (patch)
tree7271266d09abedc8b1e184040f9a938ebae5b6a6 /ltp-20150119-diotest-format-string.patch
parent8a3f2b023408e1d8c189b4ef1956fa40daf034e0 (diff)
downloadltp-fefba6a3b1efd01e5c1a43447f8607367188d940.tar.gz
ltp-fefba6a3b1efd01e5c1a43447f8607367188d940.tar.xz
ltp-fefba6a3b1efd01e5c1a43447f8607367188d940.zip
new version and fixes from pkg review (RHBZ #1172414)HEADmaster
- Update to latest upstream version - Drop upstreamed patches, and add more for format-string bugs - Use _missing_build_ids_terminate_build macro - Include COPYING and README - Fix group-writable permissions for rpmlint
Diffstat (limited to 'ltp-20150119-diotest-format-string.patch')
-rw-r--r--ltp-20150119-diotest-format-string.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/ltp-20150119-diotest-format-string.patch b/ltp-20150119-diotest-format-string.patch
new file mode 100644
index 0000000..75da796
--- /dev/null
+++ b/ltp-20150119-diotest-format-string.patch
@@ -0,0 +1,38 @@
+From 37fb2fa901f1ee9741867815e621065dd3ed4ec5 Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <kdreyer@redhat.com>
+Date: Mon, 26 Jan 2015 13:29:41 -0700
+Subject: [PATCH] diotest: use safe format argument to tst_resm()
+
+Prior to this commit, the diotest4 test failed to build if
+-Werror=format-security was used. The compiler could not examine the
+contents of the ftab array.
+
+Adjust the tst_resm calls so that the format string is a string literal.
+
+Fedora recently enabled this compiler option in their RPM builds, so
+this fixes the build on Fedora 21.
+
+Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+---
+ testcases/kernel/io/direct_io/diotest4.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/testcases/kernel/io/direct_io/diotest4.c b/testcases/kernel/io/direct_io/diotest4.c
+index 82c5b33..363fbf6 100644
+--- a/testcases/kernel/io/direct_io/diotest4.c
++++ b/testcases/kernel/io/direct_io/diotest4.c
+@@ -180,9 +180,9 @@ static void testcheck_end(int ret, int *failed, int *fail_count, char *msg)
+ if (ret != 0) {
+ *failed = TRUE;
+ (*fail_count)++;
+- tst_resm(TFAIL, msg);
++ tst_resm(TFAIL, "%s", msg);
+ } else
+- tst_resm(TPASS, msg);
++ tst_resm(TPASS, "%s", msg);
+ }
+
+ static void setup(void);
+--
+1.9.3
+