diff options
author | Deng Qingfang <dengqf6@mail2.sysu.edu.cn> | 2019-06-06 04:24:44 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2019-07-17 13:13:11 +0200 |
commit | 7a4acfce6df156da3006098abf5c44156862cf32 (patch) | |
tree | f3c6550cf3efbf44b6f47e0ff47903bf9a7b9830 /package/network/utils/iptables/patches/001-extensions_format-security_fixes_in_libip.patch | |
parent | 74b0b42fc61e890d6cb08eb660614bf96fee371b (diff) | |
download | upstream-7a4acfce6df156da3006098abf5c44156862cf32.tar.gz upstream-7a4acfce6df156da3006098abf5c44156862cf32.tar.bz2 upstream-7a4acfce6df156da3006098abf5c44156862cf32.zip |
iptables: update to 1.8.3
Update iptables to 1.8.3
ChangeLog:
https://netfilter.org/projects/iptables/files/changes-iptables-1.8.3.txt
Removed upstream patches:
- 001-extensions_format-security_fixes_in_libip.patch
- 002-include_fix_build_with_kernel_headers_before_4_2.patch
- 003-ebtables-vlan-fix_userspace_kernel_headers_collision.patch
Altered patches:
- 200-configurable_builtin.patch
- 600-shared-libext.patch
No notable size changes
Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [lipibtc ABI_VERSION fix]
(cherry picked from commit 299f6cb2da0a443484339aaa51b3d9edcc21ce4e)
Diffstat (limited to 'package/network/utils/iptables/patches/001-extensions_format-security_fixes_in_libip.patch')
-rw-r--r-- | package/network/utils/iptables/patches/001-extensions_format-security_fixes_in_libip.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/package/network/utils/iptables/patches/001-extensions_format-security_fixes_in_libip.patch b/package/network/utils/iptables/patches/001-extensions_format-security_fixes_in_libip.patch deleted file mode 100644 index 9bd85ec139..0000000000 --- a/package/network/utils/iptables/patches/001-extensions_format-security_fixes_in_libip.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 907e429d7548157016cd51aba4adc5d0c7d9f816 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adam=20Go=C5=82=C4=99biowski?= <adamg@pld-linux.org> -Date: Wed, 14 Nov 2018 07:35:28 +0100 -Subject: extensions: format-security fixes in libip[6]t_icmp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -commit 61d6c3834de3 ("xtables: add 'printf' attribute to xlate_add") -introduced support for gcc feature to check format string against passed -argument. This commit adds missing bits to extenstions's libipt_icmp.c -and libip6t_icmp6.c that were causing build to fail. - -Fixes: 61d6c3834de3 ("xtables: add 'printf' attribute to xlate_add") -Signed-off-by: Adam Gołębiowski <adamg@pld-linux.org> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - extensions/libip6t_icmp6.c | 4 ++-- - extensions/libipt_icmp.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - ---- a/extensions/libip6t_icmp6.c -+++ b/extensions/libip6t_icmp6.c -@@ -230,7 +230,7 @@ static unsigned int type_xlate_print(str - type_name = icmp6_type_xlate(icmptype); - - if (type_name) { -- xt_xlate_add(xl, type_name); -+ xt_xlate_add(xl, "%s", type_name); - } else { - for (i = 0; i < ARRAY_SIZE(icmpv6_codes); ++i) - if (icmpv6_codes[i].type == icmptype && -@@ -239,7 +239,7 @@ static unsigned int type_xlate_print(str - break; - - if (i != ARRAY_SIZE(icmpv6_codes)) -- xt_xlate_add(xl, icmpv6_codes[i].name); -+ xt_xlate_add(xl, "%s", icmpv6_codes[i].name); - else - return 0; - } ---- a/extensions/libipt_icmp.c -+++ b/extensions/libipt_icmp.c -@@ -236,7 +236,7 @@ static unsigned int type_xlate_print(str - if (icmp_codes[i].type == icmptype && - icmp_codes[i].code_min == code_min && - icmp_codes[i].code_max == code_max) { -- xt_xlate_add(xl, icmp_codes[i].name); -+ xt_xlate_add(xl, "%s", icmp_codes[i].name); - return 1; - } - } |