diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-03-16 16:30:24 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-17 16:53:04 +0000 |
commit | f8007417ea1e2d2ec2c6c88e49376f6344f3fda0 (patch) | |
tree | 3af76280ac20707e4d2627fa67e7915ab08528d2 /meta/recipes-kernel/kexec/kexec-tools/0002-ppc-Fix-format-warning-with-die.patch | |
parent | 6dcf5c6e6eadd0a572f9aa61783b54ccd39f0378 (diff) | |
download | poky-f8007417ea1e2d2ec2c6c88e49376f6344f3fda0.tar.gz |
kexec-tools: Add patches to enable format-security
Also remove the override from security_flags.inc
(From OE-Core rev: 33d084a66a371fb10e26a0a23c639c69ddd3f1e5)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kexec/kexec-tools/0002-ppc-Fix-format-warning-with-die.patch')
-rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/0002-ppc-Fix-format-warning-with-die.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0002-ppc-Fix-format-warning-with-die.patch b/meta/recipes-kernel/kexec/kexec-tools/0002-ppc-Fix-format-warning-with-die.patch new file mode 100644 index 0000000000..6a1c06df99 --- /dev/null +++ b/meta/recipes-kernel/kexec/kexec-tools/0002-ppc-Fix-format-warning-with-die.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 1c956fc8c6b6324d8d38bba5f9e60a018051c6f5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Thu, 16 Mar 2017 15:39:06 +0200 | ||
4 | Subject: [PATCH 2/2] ppc: Fix format warning with die() | ||
5 | |||
6 | Enable compiling kexec-tools for ppc with -Werror=format-security. | ||
7 | |||
8 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
9 | Upstream-Status: Submitted [Mailing list] | ||
10 | --- | ||
11 | kexec/arch/ppc/kexec-elf-ppc.c | 2 +- | ||
12 | kexec/arch/ppc/kexec-uImage-ppc.c | 2 +- | ||
13 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c | ||
16 | index 291f06d..ad43ad1 100644 | ||
17 | --- a/kexec/arch/ppc/kexec-elf-ppc.c | ||
18 | +++ b/kexec/arch/ppc/kexec-elf-ppc.c | ||
19 | @@ -453,7 +453,7 @@ out: | ||
20 | if (!tmp_cmdline) | ||
21 | free(command_line); | ||
22 | if (error_msg) | ||
23 | - die(error_msg); | ||
24 | + die("%s", error_msg); | ||
25 | |||
26 | return result; | ||
27 | } | ||
28 | diff --git a/kexec/arch/ppc/kexec-uImage-ppc.c b/kexec/arch/ppc/kexec-uImage-ppc.c | ||
29 | index 5eec6e4..e8f7adc 100644 | ||
30 | --- a/kexec/arch/ppc/kexec-uImage-ppc.c | ||
31 | +++ b/kexec/arch/ppc/kexec-uImage-ppc.c | ||
32 | @@ -306,7 +306,7 @@ out: | ||
33 | if (!tmp_cmdline) | ||
34 | free(command_line); | ||
35 | if (error_msg) | ||
36 | - die(error_msg); | ||
37 | + die("%s", error_msg); | ||
38 | return ret; | ||
39 | } | ||
40 | |||
41 | -- | ||
42 | 2.11.0 | ||
43 | |||