|
 |
029dc7 |
From 7e63dd95957a264d15eefdda3ea9449a6c72eb86 Mon Sep 17 00:00:00 2001
|
|
|
029dc7 |
From: =?UTF-8?q?Adam=20Go=C5=82=C4=99biowski?= <adamg@pld-linux.org>
|
|
|
029dc7 |
Date: Wed, 14 Nov 2018 07:35:28 +0100
|
|
|
029dc7 |
Subject: [PATCH] extensions: format-security fixes in libip[6]t_icmp
|
|
|
029dc7 |
MIME-Version: 1.0
|
|
|
029dc7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
029dc7 |
Content-Transfer-Encoding: 8bit
|
|
|
029dc7 |
|
|
|
029dc7 |
commit 61d6c3834de3 ("xtables: add 'printf' attribute to xlate_add")
|
|
|
029dc7 |
introduced support for gcc feature to check format string against passed
|
|
|
029dc7 |
argument. This commit adds missing bits to extenstions's libipt_icmp.c
|
|
|
029dc7 |
and libip6t_icmp6.c that were causing build to fail.
|
|
|
029dc7 |
|
|
|
029dc7 |
Fixes: 61d6c3834de3 ("xtables: add 'printf' attribute to xlate_add")
|
|
|
029dc7 |
Signed-off-by: Adam Gołębiowski <adamg@pld-linux.org>
|
|
|
029dc7 |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
029dc7 |
(cherry picked from commit 907e429d7548157016cd51aba4adc5d0c7d9f816)
|
|
|
029dc7 |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
029dc7 |
---
|
|
|
029dc7 |
extensions/libip6t_icmp6.c | 4 ++--
|
|
|
029dc7 |
extensions/libipt_icmp.c | 2 +-
|
|
|
029dc7 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
029dc7 |
|
|
|
029dc7 |
diff --git a/extensions/libip6t_icmp6.c b/extensions/libip6t_icmp6.c
|
|
|
029dc7 |
index 45a71875722c4..cc7bfaeb72fd7 100644
|
|
|
029dc7 |
--- a/extensions/libip6t_icmp6.c
|
|
|
029dc7 |
+++ b/extensions/libip6t_icmp6.c
|
|
|
029dc7 |
@@ -230,7 +230,7 @@ static unsigned int type_xlate_print(struct xt_xlate *xl, unsigned int icmptype,
|
|
|
029dc7 |
type_name = icmp6_type_xlate(icmptype);
|
|
|
029dc7 |
|
|
|
029dc7 |
if (type_name) {
|
|
|
029dc7 |
- xt_xlate_add(xl, type_name);
|
|
|
029dc7 |
+ xt_xlate_add(xl, "%s", type_name);
|
|
|
029dc7 |
} else {
|
|
|
029dc7 |
for (i = 0; i < ARRAY_SIZE(icmpv6_codes); ++i)
|
|
|
029dc7 |
if (icmpv6_codes[i].type == icmptype &&
|
|
|
029dc7 |
@@ -239,7 +239,7 @@ static unsigned int type_xlate_print(struct xt_xlate *xl, unsigned int icmptype,
|
|
|
029dc7 |
break;
|
|
|
029dc7 |
|
|
|
029dc7 |
if (i != ARRAY_SIZE(icmpv6_codes))
|
|
|
029dc7 |
- xt_xlate_add(xl, icmpv6_codes[i].name);
|
|
|
029dc7 |
+ xt_xlate_add(xl, "%s", icmpv6_codes[i].name);
|
|
|
029dc7 |
else
|
|
|
029dc7 |
return 0;
|
|
|
029dc7 |
}
|
|
|
029dc7 |
diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c
|
|
|
029dc7 |
index 5418997668d4c..e76257c54708c 100644
|
|
|
029dc7 |
--- a/extensions/libipt_icmp.c
|
|
|
029dc7 |
+++ b/extensions/libipt_icmp.c
|
|
|
029dc7 |
@@ -236,7 +236,7 @@ static unsigned int type_xlate_print(struct xt_xlate *xl, unsigned int icmptype,
|
|
|
029dc7 |
if (icmp_codes[i].type == icmptype &&
|
|
|
029dc7 |
icmp_codes[i].code_min == code_min &&
|
|
|
029dc7 |
icmp_codes[i].code_max == code_max) {
|
|
|
029dc7 |
- xt_xlate_add(xl, icmp_codes[i].name);
|
|
|
029dc7 |
+ xt_xlate_add(xl, "%s", icmp_codes[i].name);
|
|
|
029dc7 |
return 1;
|
|
|
029dc7 |
}
|
|
|
029dc7 |
}
|
|
|
029dc7 |
--
|
|
|
029dc7 |
2.21.0
|
|
|
029dc7 |
|