From: Pablo Neira Ayuso <pablo@netfilter.org> Hi David, The following patchset contains two Netfilter fixes: * Fix buffer overflow in the name of the timeout policy object in the cttimeout infrastructure, from Florian Westphal. * Fix a bug in the hash set in case that IP ranges are specified, from Jozsef Kadlecsik. You can pull these changes from: git://1984.lsi.us.es/nf master Thanks! Florian Westphal (1): netfilter: cttimeout: fix buffer overflow Jozsef Kadlecsik (1): netfilter: ipset: Fix range bug in hash:ip,port,net net/netfilter/ipset/ip_set_hash_ip.c | 4 ++-- net/netfilter/ipset/ip_set_hash_ipport.c | 7 +++---- net/netfilter/ipset/ip_set_hash_ipportip.c | 7 +++---- net/netfilter/ipset/ip_set_hash_ipportnet.c | 7 +++++-- net/netfilter/nfnetlink_cttimeout.c | 3 ++- 5 files changed, 15 insertions(+), 13 deletions(-) -- 1.7.10.4
From: pablo@netfilter.org
Date: Thu, 22 Nov 2012 10:10:50 +0100
> The following patchset contains two Netfilter fixes:
>
> * Fix buffer overflow in the name of the timeout policy object
> in the cttimeout infrastructure, from Florian Westphal.
>
> * Fix a bug in the hash set in case that IP ranges are
> specified, from Jozsef Kadlecsik.
Pulled, thanks Pablo.
From: Pablo Neira Ayuso <pablo@netfilter.org> Hi David, The following patchset contains two bugfixes for netfilter/ipset via Jozsef Kadlecsik, they are: * Fix timeout corruption if sets are resized, by Josh Hunt. * Fix bogus error report if the flag nomatch is set, from Jozsef. You can pull these changes from: git://1984.lsi.us.es/nf master Thanks! Josh Hunt (1): netfilter: ipset: timeout values corrupted on set resize Jozsef Kadlecsik (1): netfilter: ipset: "Directory not empty" error message include/linux/netfilter/ipset/ip_set_ahash.h | 4 +++- net/netfilter/ipset/ip_set_core.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) -- 1.7.10.4
From: Josh Hunt <johunt@akamai.com> If a resize is triggered on a set with timeouts enabled, the timeout values will get corrupted when copying them to the new set. This occured b/c the wrong timeout value is supplied to type_pf_elem_tadd(). This also adds simple debug statement similar to the one in type_pf_resize(). Signed-off-by: Josh Hunt <johunt@akamai.com> Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> --- include/linux/netfilter/ipset/ip_set_ahash.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/netfilter/ipset/ip_set_ahash.h b/include/linux/netfilter/ipset/ip_set_ahash.h index ef9acd3..01d25e6 100644 --- a/include/linux/netfilter/ipset/ip_set_ahash.h +++ b/include/linux/netfilter/ipset/ip_set_ahash.h @@ -854,6 +854,8 @@ type_pf_tresize(struct ip_set *set, bool retried) retry: ret = 0; htable_bits++; + pr_debug("attempt to resize set %s from %u to %u, t %p\n", + set->name, orig->htable_bits, htable_bits, orig); if (!htable_bits) { /* In case we have plenty of memory :-) */ pr_warning("Cannot increase the hashsize of set %s further\n", @@ -873,7 +875,7 @@ retry: data = ahash_tdata(n, j); m = hbucket(t, HKEY(data, h->initval, htable_bits)); ret = type_pf_elem_tadd(m, data, AHASH_MAX(h), 0, - type_pf_data_timeout(data)); + ip_set_timeout_get(type_pf_data_timeout(data))); if (ret < 0) { read_unlock_bh(&set->lock); ahash_destroy(t); -- 1.7.10.4
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> When an entry flagged with "nomatch" was tested by ipset, it returned the error message "Kernel error received: Directory not empty" instead of "<element> is NOT in set <setname>" (reported by John Brendler). The internal error code was not properly transformed before returning to userspace, fixed. Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> --- net/netfilter/ipset/ip_set_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index 6d6d8f2..38ca630 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -1470,7 +1470,8 @@ ip_set_utest(struct sock *ctnl, struct sk_buff *skb, if (ret == -EAGAIN) ret = 1; - return ret < 0 ? ret : ret > 0 ? 0 : -IPSET_ERR_EXIST; + return (ret < 0 && ret != -ENOTEMPTY) ? ret : + ret > 0 ? 0 : -IPSET_ERR_EXIST; } /* Get headed data of a set */ -- 1.7.10.4
From: pablo@netfilter.org
Date: Tue, 26 Feb 2013 14:45:18 +0100
> From: Pablo Neira Ayuso <pablo@netfilter.org>
>
> Hi David,
>
> The following patchset contains two bugfixes for netfilter/ipset via
> Jozsef Kadlecsik, they are:
>
> * Fix timeout corruption if sets are resized, by Josh Hunt.
>
> * Fix bogus error report if the flag nomatch is set, from Jozsef.
>
> You can pull these changes from:
>
> git://1984.lsi.us.es/nf master
Pulled, thanks Pablo.
Hi David, If time allows, please consider pulling the following patchset contains two late Netfilter fixes, they are: * Skip broadcast/multicast locally generated traffic in the rpfilter, (closes netfilter bugzilla #814), from Florian Westphal. * Fix missing elements in the listing of ipset bitmap ip,mac set type with timeout support enabled, from Jozsef Kadlecsik. The following changes since commit c2d421e171868586939c328dfb91bab840fe4c49: netfilter: nf_nat: fix race when unloading protocol modules (2013-04-12 11:46:31 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master for you to fetch changes up to f83a7ea2075ca896f2dbf07672bac9cf3682ff74: netfilter: xt_rpfilter: skip locally generated broadcast/multicast, too (2013-04-19 00:11:59 +0200) ---------------------------------------------------------------- Florian Westphal (1): netfilter: xt_rpfilter: skip locally generated broadcast/multicast, too Jozsef Kadlecsik (1): netfilter: ipset: bitmap:ip,mac: fix listing with timeout net/ipv4/netfilter/ipt_rpfilter.c | 8 +++++++- net/ipv6/netfilter/ip6t_rpfilter.c | 8 +++++++- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 6 +++++- 3 files changed, 19 insertions(+), 3 deletions(-)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 19 Apr 2013 03:16:00 +0200
> If time allows, please consider pulling the following patchset contains two
> late Netfilter fixes, they are:
>
> * Skip broadcast/multicast locally generated traffic in the rpfilter,
> (closes netfilter bugzilla #814), from Florian Westphal.
>
> * Fix missing elements in the listing of ipset bitmap ip,mac set
> type with timeout support enabled, from Jozsef Kadlecsik.
>
> The following changes since commit c2d421e171868586939c328dfb91bab840fe4c49:
>
> netfilter: nf_nat: fix race when unloading protocol modules (2013-04-12 11:46:31 +0200)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master
Pulled, thanks Pablo.
Hi David, The following patchset contains two Netfilter fixes for your net tree, they are: * Fix endianness in nft_reject, the NFTA_REJECT_TYPE netlink attributes was not converted to network byte order as needed by all nfnetlink subsystems, from Eric Leblond. * Restrict SYNPROXY target to INPUT and FORWARD chains, this avoid a possible crash due to misconfigurations, from Patrick McHardy. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master Thanks! ---------------------------------------------------------------- The following changes since commit 8afdd99a1315e759de04ad6e2344f0c5f17ecb1b: udp: ipv4: fix an use after free in __udp4_lib_rcv() (2013-12-10 22:58:40 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master for you to fetch changes up to a3adadf3018102c24754e0b53a5515c40fbaff4a: netfilter: nft_reject: fix endianness in dump function (2013-12-12 09:37:39 +0100) ---------------------------------------------------------------- Eric Leblond (1): netfilter: nft_reject: fix endianness in dump function Patrick McHardy (1): netfilter: SYNPROXY target: restrict to INPUT/FORWARD net/ipv4/netfilter/ipt_SYNPROXY.c | 1 + net/ipv4/netfilter/nft_reject_ipv4.c | 2 +- net/ipv6/netfilter/ip6t_SYNPROXY.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) Eric Leblond (1): netfilter: nft_reject: fix endianness in dump function Patrick McHardy (1): netfilter: SYNPROXY target: restrict to INPUT/FORWARD net/ipv4/netfilter/ipt_SYNPROXY.c | 1 + net/ipv4/netfilter/nft_reject_ipv4.c | 2 +- net/ipv6/netfilter/ip6t_SYNPROXY.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) -- 1.7.10.4
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 13 Dec 2013 19:24:57 +0100
> The following patchset contains two Netfilter fixes for your net
> tree, they are:
>
> * Fix endianness in nft_reject, the NFTA_REJECT_TYPE netlink attributes
> was not converted to network byte order as needed by all nfnetlink
> subsystems, from Eric Leblond.
>
> * Restrict SYNPROXY target to INPUT and FORWARD chains, this avoid a
> possible crash due to misconfigurations, from Patrick McHardy.
>
> You can pull these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master
Pulled, thanks Pablo.
Hi David, The following patchset contains two patches: * fix the IRC NAT helper which was broken when adding (incomplete) IPv6 support, from Daniel Borkmann. * Refine the previous bugtrap that Jesper added to catch problems for the usage of the sequence adjustment extension in IPVs in Dec 16th, it may spam messages in case of finding a real bug. I know it's fairly late, so please let me know if you prefer that I pass you these via net-next. Thanks! ---------------------------------------------------------------- The following changes since commit f35f76ee76df008131bbe01a2297de0c55ee2297: xen-netback: Include header for vmalloc (2014-01-05 20:34:36 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master for you to fetch changes up to f2661adc0c134d890d84c32d7cb54a2b4d1f0a5f: netfilter: only warn once on wrong seqadj usage (2014-01-06 14:23:17 +0100) ---------------------------------------------------------------- Daniel Borkmann (1): netfilter: nf_nat: fix access to uninitialized buffer in IRC NAT helper Jesper Dangaard Brouer (1): netfilter: only warn once on wrong seqadj usage net/netfilter/nf_conntrack_seqadj.c | 2 +- net/netfilter/nf_nat_irc.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 6 deletions(-)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 7 Jan 2014 23:13:37 +0100
> The following patchset contains two patches:
>
> * fix the IRC NAT helper which was broken when adding (incomplete) IPv6
> support, from Daniel Borkmann.
>
> * Refine the previous bugtrap that Jesper added to catch problems for the
> usage of the sequence adjustment extension in IPVs in Dec 16th, it may
> spam messages in case of finding a real bug.
>
> I know it's fairly late, so please let me know if you prefer that I pass
> you these via net-next.
These look fine, thanks Pablo.
Hi David, The following patchset contains two bugfixes for your net tree, they are: 1) Validate netlink group from nfnetlink to avoid an out of bound array access. This should only happen with superuser priviledges though. Discovered by Andrey Ryabinin using trinity. 2) Don't push ethernet header before calling the netfilter output hook for multicast traffic, this breaks ebtables since it expects to see skb->data pointing to the network header, patch from Linus Luessing. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git Thanks! ---------------------------------------------------------------- The following changes since commit feb91a02ccb09661507f170b2a444aec94f307f9: ipv6: mld: fix add_grhead skb_over_panic for devs with large MTUs (2014-11-16 16:55:06 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master for you to fetch changes up to f0b4eeced518c632210ef2aea44fc92cc9e86cce: bridge: fix netfilter/NF_BR_LOCAL_OUT for own, locally generated queries (2014-11-17 12:38:02 +0100) ---------------------------------------------------------------- Linus Lüssing (1): bridge: fix netfilter/NF_BR_LOCAL_OUT for own, locally generated queries Pablo Neira Ayuso (1): netfilter: nfnetlink: fix insufficient validation in nfnetlink_bind net/bridge/br_multicast.c | 3 +-- net/netfilter/nfnetlink.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 20 Nov 2014 13:30:49 +0100
> The following patchset contains two bugfixes for your net tree, they are:
>
> 1) Validate netlink group from nfnetlink to avoid an out of bound array
> access. This should only happen with superuser priviledges though.
> Discovered by Andrey Ryabinin using trinity.
>
> 2) Don't push ethernet header before calling the netfilter output hook
> for multicast traffic, this breaks ebtables since it expects to see
> skb->data pointing to the network header, patch from Linus Luessing.
>
> You can pull these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, thanks Pablo.
Hi David, The following patchset contains Netfilter fixes for your net tree, they are: 1) Fix a crash in nf_tables when dictionaries are used from the ruleset, due to memory corruption, from Florian Westphal. 2) Fix another crash in nf_queue when used with br_netfilter. Also from Florian. Both fixes are related to new stuff that got in 4.0-rc. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git Thanks! ---------------------------------------------------------------- The following changes since commit b357a364c57c940ddb932224542494363df37378: inet: fix possible panic in reqsk_queue_unlink() (2015-04-24 11:39:15 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master for you to fetch changes up to 547c4b547e07dcc60874b6ef6252dd49ff74aec1: netfilter: bridge: fix NULL deref in physin/out ifindex helpers (2015-04-24 20:51:40 +0200) ---------------------------------------------------------------- Florian Westphal (2): netfilter: nf_tables: fix wrong length for jump/goto verdicts netfilter: bridge: fix NULL deref in physin/out ifindex helpers include/linux/netfilter_bridge.h | 16 ++++++++++++++-- net/netfilter/nf_tables_api.c | 3 +-- 2 files changed, 15 insertions(+), 4 deletions(-)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 27 Apr 2015 20:41:55 +0200
> The following patchset contains Netfilter fixes for your net tree,
> they are:
>
> 1) Fix a crash in nf_tables when dictionaries are used from the ruleset,
> due to memory corruption, from Florian Westphal.
>
> 2) Fix another crash in nf_queue when used with br_netfilter. Also from
> Florian.
>
> Both fixes are related to new stuff that got in 4.0-rc.
Pulled, thanks Pablo.
Hi David, The following patchset contains two netfilter fixes: 1) Oneliner from Florian to dump missing NFT_CT_L3PROTOCOL netlink attribute, from Florian Westphal. 2) Another oneliner for nf_tables to use skb->protocol from the new netdev family, we can't assume ethernet there. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git Thanks! ---------------------------------------------------------------- The following changes since commit 73796d8bf27372e26c2b79881947304c14c2d353: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2015-12-17 14:05:22 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD for you to fetch changes up to d5f79b6e4d169039903cc869e16e59ad861dd479: netfilter: nft_ct: include direction when dumping NFT_CT_L3PROTOCOL key (2015-12-18 14:45:45 +0100) ---------------------------------------------------------------- Florian Westphal (1): netfilter: nft_ct: include direction when dumping NFT_CT_L3PROTOCOL key Pablo Neira Ayuso (1): netfilter: nf_tables: use skb->protocol instead of assuming ethernet header net/netfilter/nf_tables_netdev.c | 2 +- net/netfilter/nft_ct.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 22 Dec 2015 18:53:15 +0100
> The following patchset contains two netfilter fixes:
>
> 1) Oneliner from Florian to dump missing NFT_CT_L3PROTOCOL netlink
> attribute, from Florian Westphal.
>
> 2) Another oneliner for nf_tables to use skb->protocol from the new
> netdev family, we can't assume ethernet there.
>
> You can pull these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, thanks Pablo.
Hi David, The following patchset contains two Netfilter fixes for your net tree, they are: 1) Fix memleak from netns release path of conntrack protocol trackers, patch from Liping Zhang. 2) Uninitialized flags field in ebt_log, that results in unpredictable logging format in ebtables, also from Liping. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git Thanks a lot! ---------------------------------------------------------------- The following changes since commit e20bd60bf62a2448be873653c7febca1d4d73afc: net: usb: asix88179_178a: Add support for the Belkin B2B128 (2017-06-27 15:46:07 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD for you to fetch changes up to 91af6ba7ff16bd7e5919aedfe70aad73a3375619: netfilter: ebt_nflog: fix unexpected truncated packet (2017-06-29 18:47:02 +0200) ---------------------------------------------------------------- Liping Zhang (2): netfilter: nf_ct_dccp/sctp: fix memory leak after netns cleanup netfilter: ebt_nflog: fix unexpected truncated packet net/bridge/netfilter/ebt_nflog.c | 1 + net/netfilter/nf_conntrack_proto_dccp.c | 7 +++++++ net/netfilter/nf_conntrack_proto_sctp.c | 7 +++++++ 3 files changed, 15 insertions(+)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 6 Jul 2017 14:54:23 +0200
> The following patchset contains two Netfilter fixes for your net tree,
> they are:
>
> 1) Fix memleak from netns release path of conntrack protocol trackers,
> patch from Liping Zhang.
>
> 2) Uninitialized flags field in ebt_log, that results in unpredictable
> logging format in ebtables, also from Liping.
>
> You can pull these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
>
> Thanks a lot!
My name is David, and how do you do?
Pulled, thanks Pablo.
Hi David, The following patchset contains two Netfilter fixes for your net tree, they are: 1) Fix NAt compilation with UP, from Geert Uytterhoeven. 2) Fix incorrect number of entries when dumping a set, from Vishwanath Pai. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git Thanks! ---------------------------------------------------------------- The following changes since commit 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e: Linux 4.14-rc1 (2017-09-16 15:47:51 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD for you to fetch changes up to 7f4f7dd4417d9efd038b14d39c70170db2e0baa0: netfilter: ipset: ipset list may return wrong member count for set with timeout (2017-09-18 17:35:32 +0200) ---------------------------------------------------------------- Geert Uytterhoeven (1): netfilter: nat: Do not use ARRAY_SIZE() on spinlocks to fix zero div Vishwanath Pai (1): netfilter: ipset: ipset list may return wrong member count for set with timeout net/netfilter/ipset/ip_set_hash_gen.h | 14 +++++++++++++- net/netfilter/nf_nat_core.c | 12 ++++++------ 2 files changed, 19 insertions(+), 7 deletions(-)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 20 Sep 2017 12:49:01 +0200
> The following patchset contains two Netfilter fixes for your net tree,
> they are:
>
> 1) Fix NAt compilation with UP, from Geert Uytterhoeven.
>
> 2) Fix incorrect number of entries when dumping a set, from
> Vishwanath Pai.
Pulled, thanks Pablo.
Hi David, The following patchset contains two one-liner fixes for your net tree, they are: 1) Disable fast hash operations for 2-bytes length keys which is leading to incorrect lookups in nf_tables, from Anatole Denis. 2) Reload pointer ipv4 header after ip_route_me_harder() given this may result in use-after-free due to skbuff header reallocation, patch from Tejaswi Tanikella. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git Thanks! ---------------------------------------------------------------- The following changes since commit 28e33f9d78eefe98ea86673ab31e988b37a9a738: bpf: disallow arithmetic operations on context pointer (2017-10-18 13:21:13 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD for you to fetch changes up to 7400bb4b5800831581a82f71700af6a5e815c3c8: netfilter: nf_reject_ipv4: Fix use-after-free in send_reset (2017-11-01 12:15:29 +0100) ---------------------------------------------------------------- Anatole Denis (1): netfilter: nft_set_hash: disable fast_ops for 2-len keys Tejaswi Tanikella (1): netfilter: nf_reject_ipv4: Fix use-after-free in send_reset net/ipv4/netfilter/nf_reject_ipv4.c | 2 ++ net/netfilter/nft_set_hash.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 1 Nov 2017 19:48:10 +0100
> The following patchset contains two one-liner fixes for your net tree,
> they are:
>
> 1) Disable fast hash operations for 2-bytes length keys which is leading
> to incorrect lookups in nf_tables, from Anatole Denis.
>
> 2) Reload pointer ipv4 header after ip_route_me_harder() given this may
> result in use-after-free due to skbuff header reallocation, patch
> from Tejaswi Tanikella.
>
> You can pull these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, thanks a lot Pablo.
Hi David, The following patchset contains Netfilter fixes for net: 1) Out-of-bound access to packet data from the snmp nat helper, from Jann Horn. 2) ICMP(v6) error packets are set as related traffic by conntrack, update protocol number before calling nf_nat_ipv4_manip_pkt() to use ICMP(v6) rather than the original protocol number, from Florian Westphal. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git Thanks! ---------------------------------------------------------------- The following changes since commit 31b58ad0c3279817cd246eab27eaf53b626dfcde: Merge branch 'r8169-revert-two-commits-due-to-a-regression' (2019-02-10 12:54:49 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD for you to fetch changes up to 8303b7e8f018724a2cd7752eb29c2801fa8c4067: netfilter: nat: fix spurious connection timeouts (2019-02-11 17:43:17 +0100) ---------------------------------------------------------------- Florian Westphal (1): netfilter: nat: fix spurious connection timeouts Jann Horn (1): netfilter: nf_nat_snmp_basic: add missing length checks in ASN.1 cbs net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 1 + net/ipv4/netfilter/nf_nat_snmp_basic_main.c | 7 ++++++- net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 1 + 3 files changed, 8 insertions(+), 1 deletion(-)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 11 Feb 2019 17:53:17 +0100
> The following patchset contains Netfilter fixes for net:
>
> 1) Out-of-bound access to packet data from the snmp nat helper,
> from Jann Horn.
>
> 2) ICMP(v6) error packets are set as related traffic by conntrack,
> update protocol number before calling nf_nat_ipv4_manip_pkt()
> to use ICMP(v6) rather than the original protocol number,
> from Florian Westphal.
>
> You can pull these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, thanks Pablo.
Hi, The following patchset contains Netfilter fixes for net: 1) Remove the skb_ext_del from nf_reset, and renames it to a more fitting nf_reset_ct(). Patch from Florian Westphal. 2) Fix deadlock in nft_connlimit between packet path updates and the garbage collector. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git Thanks. ---------------------------------------------------------------- The following changes since commit 9cfc370240c31c7f31f445e69190dd15be8e5d7d: Merge tag 'mac80211-for-davem-2019-10-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (2019-10-01 09:28:56 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD for you to fetch changes up to 34a4c95abd25ab41fb390b985a08a651b1fa0b0f: netfilter: nft_connlimit: disable bh on garbage collection (2019-10-01 18:42:15 +0200) ---------------------------------------------------------------- Florian Westphal (1): netfilter: drop bridge nf reset from nf_reset Pablo Neira Ayuso (1): netfilter: nft_connlimit: disable bh on garbage collection drivers/net/ppp/pptp.c | 4 ++-- drivers/net/tun.c | 2 +- drivers/net/virtio_net.c | 2 +- drivers/net/vrf.c | 8 ++++---- drivers/net/wireless/mac80211_hwsim.c | 4 ++-- drivers/staging/octeon/ethernet-tx.c | 6 ++---- include/linux/skbuff.h | 5 +---- net/batman-adv/soft-interface.c | 2 +- net/core/skbuff.c | 2 +- net/dccp/ipv4.c | 2 +- net/ipv4/ip_input.c | 2 +- net/ipv4/ipmr.c | 4 ++-- net/ipv4/netfilter/nf_dup_ipv4.c | 2 +- net/ipv4/raw.c | 2 +- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/udp.c | 4 ++-- net/ipv6/ip6_input.c | 2 +- net/ipv6/netfilter/nf_dup_ipv6.c | 2 +- net/ipv6/raw.c | 2 +- net/l2tp/l2tp_core.c | 2 +- net/l2tp/l2tp_eth.c | 2 +- net/l2tp/l2tp_ip.c | 2 +- net/l2tp/l2tp_ip6.c | 2 +- net/netfilter/ipvs/ip_vs_xmit.c | 2 +- net/netfilter/nft_connlimit.c | 7 ++++++- net/openvswitch/vport-internal_dev.c | 2 +- net/packet/af_packet.c | 4 ++-- net/sctp/input.c | 2 +- net/xfrm/xfrm_input.c | 2 +- net/xfrm/xfrm_interface.c | 2 +- net/xfrm/xfrm_output.c | 2 +- net/xfrm/xfrm_policy.c | 2 +- 32 files changed, 46 insertions(+), 46 deletions(-)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 2 Oct 2019 20:53:43 +0200
> The following patchset contains Netfilter fixes for net:
>
> 1) Remove the skb_ext_del from nf_reset, and renames it to a more
> fitting nf_reset_ct(). Patch from Florian Westphal.
>
> 2) Fix deadlock in nft_connlimit between packet path updates and
> the garbage collector.
>
> You can pull these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, thanks Pablo.
Hi, The following patchset contains Netfilter fixes for net: 1) flow_block_cb memleak in nf_flow_table_offload_del_cb(), from Roi Dayan. 2) Fix error path handling in nf_nat_inet_register_fn(), from Hillf Danton. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git Thank you. ---------------------------------------------------------------- The following changes since commit 82f35276c64ff720de11fba31fd6369b45647a2e: Merge tag 'wireless-drivers-2020-04-14' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers (2020-04-14 13:07:19 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD for you to fetch changes up to b4faef1739dd1f3b3981b8bf173a2266ea86b1eb: netfilter: nat: fix error handling upon registering inet hook (2020-04-19 14:59:31 +0200) ---------------------------------------------------------------- Hillf Danton (1): netfilter: nat: fix error handling upon registering inet hook Roi Dayan (1): netfilter: flowtable: Free block_cb when being deleted net/netfilter/nf_flow_table_core.c | 6 ++++-- net/netfilter/nf_nat_proto.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 21 Apr 2020 12:37:57 +0200
> The following patchset contains Netfilter fixes for net:
>
> 1) flow_block_cb memleak in nf_flow_table_offload_del_cb(), from Roi Dayan.
>
> 2) Fix error path handling in nf_nat_inet_register_fn(), from Hillf Danton.
>
> You can pull these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, thanks Pablo.
Hi David, The following patchset contains Netfilter fixes for net: 1) Do not update the UDP checksum when it's zero, from Guillaume Nault. 2) Fix return of local variable in nf_osf, from Arnd Bergmann. You can pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git Thank you. ---------------------------------------------------------------- The following changes since commit 52a90612fa6108d20cffd3cf6a2c228e2f3619f7: net: remove obsolete comment (2020-04-25 20:49:32 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD for you to fetch changes up to c165d57b552aaca607fa5daf3fb524a6efe3c5a3: netfilter: nf_osf: avoid passing pointer to local var (2020-04-29 21:17:57 +0200) ---------------------------------------------------------------- Arnd Bergmann (1): netfilter: nf_osf: avoid passing pointer to local var Guillaume Nault (1): netfilter: nat: never update the UDP checksum when it's 0 net/netfilter/nf_nat_proto.c | 4 +--- net/netfilter/nfnetlink_osf.c | 12 +++++++----- 2 files changed, 8 insertions(+), 8 deletions(-)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 29 Apr 2020 23:48:09 +0200
> The following patchset contains Netfilter fixes for net:
>
> 1) Do not update the UDP checksum when it's zero, from Guillaume Nault.
>
> 2) Fix return of local variable in nf_osf, from Arnd Bergmann.
>
> You can pull these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, thanks Pablo.
Hi, The following patchset contains Netfilter fixes for net: 1) Use kvfree() to release vmalloc()'ed areas in ipset, from Eric Dumazet. 2) UAF in nfnetlink_queue from the nf_conntrack_update() path. Please, pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git Thank you. ---------------------------------------------------------------- The following changes since commit 33c568ba49e2b0ff7c3daead5d9427be797a4c43: Merge tag 'mac80211-for-net-2020-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (2020-06-29 16:58:30 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD for you to fetch changes up to d005fbb855d3b5660d62ee5a6bd2d99c13ff8cf3: netfilter: conntrack: refetch conntrack after nf_conntrack_update() (2020-07-03 14:47:03 +0200) ---------------------------------------------------------------- Eric Dumazet (1): netfilter: ipset: call ip_set_free() instead of kfree() Pablo Neira Ayuso (1): netfilter: conntrack: refetch conntrack after nf_conntrack_update() net/netfilter/ipset/ip_set_bitmap_ip.c | 2 +- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 2 +- net/netfilter/ipset/ip_set_bitmap_port.c | 2 +- net/netfilter/ipset/ip_set_hash_gen.h | 4 ++-- net/netfilter/nf_conntrack_core.c | 2 ++ 5 files changed, 7 insertions(+), 5 deletions(-)
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Sat, 4 Jul 2020 02:13:57 +0200
> The following patchset contains Netfilter fixes for net:
>
> 1) Use kvfree() to release vmalloc()'ed areas in ipset, from Eric Dumazet.
>
> 2) UAF in nfnetlink_queue from the nf_conntrack_update() path.
>
> Please, pull these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, thanks Pablo.