summaryrefslogtreecommitdiffstats
path: root/ltp-20150119-diotest-format-string.patch
blob: 75da796145ddf6d97fb74d7516959ebde45f53b4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
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