diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-11-01 18:01:44 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-12-15 14:28:48 +0100 |
commit | 9261e7447ea7b8d33b70ff6ea008f2041a88e255 (patch) | |
tree | c9af04326ac9953a33fc8fd3e852c11fc1eb4df3 /target/linux/generic/backport-4.19/336-v4.15-netfilter-exit_net-cleanup-check-added.patch | |
parent | 52a82ce3dd901a1536c7d7d9d963e9c2d761c816 (diff) | |
download | upstream-9261e7447ea7b8d33b70ff6ea008f2041a88e255.tar.gz upstream-9261e7447ea7b8d33b70ff6ea008f2041a88e255.tar.bz2 upstream-9261e7447ea7b8d33b70ff6ea008f2041a88e255.zip |
kernel: Make the patches apply on top of 4.19
This makes the patches which were just copied in the previous commit
apply on top of kernel 4.19.
The patches in the backports-4.19 folder were checked if they are really
in kernel 4.19 based on the title and only removed if they were found in
the upstream kernel.
The following additional patches form the pending folder went into
upstream Linux 4.19:
pending-4.19/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch
pending-4.19/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch
pending-4.19/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch
pending-4.19/479-mtd-spi-nor-add-eon-en25qh32.patch
pending-4.19/950-tty-serial-exar-generalize-rs485-setup.patch
pending-4.19/340-MIPS-mm-remove-mips_dma_mapping_error.patch
Bigger changes were introduced to the m25p80 spi nor driver, as far as I
saw it in the new code, it now has the functionality provided in this
patch:
pending-4.19/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch
Part of this patch went upstream independent of OpenWrt:
hack-4.19/220-gc_sections.patch
This patch was reworked to match the changes done upstream.
The MIPS DMA API changed a lot, this patch was rewritten to match the
new DMA handling:
pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
I did bigger manual changes to the following patches and I am not 100% sure if they are all correct:
pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch
pending-4.19/411-mtd-partial_eraseblock_write.patch
pending-4.19/600-netfilter_conntrack_flush.patch
pending-4.19/611-netfilter_match_bypass_default_table.patch
pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
hack-4.19/211-host_tools_portability.patch
hack-4.19/221-module_exports.patch
hack-4.19/321-powerpc_crtsavres_prereq.patch
hack-4.19/902-debloat_proc.patch
This is based on patchset from Marko Ratkaj <marko.ratkaj@sartura.hr>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-4.19/336-v4.15-netfilter-exit_net-cleanup-check-added.patch')
-rw-r--r-- | target/linux/generic/backport-4.19/336-v4.15-netfilter-exit_net-cleanup-check-added.patch | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/target/linux/generic/backport-4.19/336-v4.15-netfilter-exit_net-cleanup-check-added.patch b/target/linux/generic/backport-4.19/336-v4.15-netfilter-exit_net-cleanup-check-added.patch deleted file mode 100644 index 5938a9ba5a..0000000000 --- a/target/linux/generic/backport-4.19/336-v4.15-netfilter-exit_net-cleanup-check-added.patch +++ /dev/null @@ -1,100 +0,0 @@ -From: Vasily Averin <vvs@virtuozzo.com> -Date: Sun, 12 Nov 2017 14:32:37 +0300 -Subject: [PATCH] netfilter: exit_net cleanup check added - -Be sure that lists initialized in net_init hook was return to initial -state. - -Signed-off-by: Vasily Averin <vvs@virtuozzo.com> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - ---- a/net/ipv4/netfilter/ipt_CLUSTERIP.c -+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c -@@ -834,6 +834,7 @@ static void clusterip_net_exit(struct ne - cn->procdir = NULL; - #endif - nf_unregister_net_hook(net, &cip_arp_ops); -+ WARN_ON_ONCE(!list_empty(&cn->configs)); - } - - static struct pernet_operations clusterip_net_ops = { ---- a/net/netfilter/nf_tables_api.c -+++ b/net/netfilter/nf_tables_api.c -@@ -6545,6 +6545,12 @@ static int __net_init nf_tables_init_net - return 0; - } - -+static void __net_exit nf_tables_exit_net(struct net *net) -+{ -+ WARN_ON_ONCE(!list_empty(&net->nft.af_info)); -+ WARN_ON_ONCE(!list_empty(&net->nft.commit_list)); -+} -+ - int __nft_release_basechain(struct nft_ctx *ctx) - { - struct nft_rule *rule, *nr; -@@ -6622,6 +6628,7 @@ static void __nft_release_afinfo(struct - - static struct pernet_operations nf_tables_net_ops = { - .init = nf_tables_init_net, -+ .exit = nf_tables_exit_net, - }; - - static int __init nf_tables_module_init(void) ---- a/net/netfilter/nfnetlink_log.c -+++ b/net/netfilter/nfnetlink_log.c -@@ -1093,10 +1093,15 @@ static int __net_init nfnl_log_net_init( - - static void __net_exit nfnl_log_net_exit(struct net *net) - { -+ struct nfnl_log_net *log = nfnl_log_pernet(net); -+ unsigned int i; -+ - #ifdef CONFIG_PROC_FS - remove_proc_entry("nfnetlink_log", net->nf.proc_netfilter); - #endif - nf_log_unset(net, &nfulnl_logger); -+ for (i = 0; i < INSTANCE_BUCKETS; i++) -+ WARN_ON_ONCE(!hlist_empty(&log->instance_table[i])); - } - - static struct pernet_operations nfnl_log_net_ops = { ---- a/net/netfilter/nfnetlink_queue.c -+++ b/net/netfilter/nfnetlink_queue.c -@@ -1510,10 +1510,15 @@ static int __net_init nfnl_queue_net_ini - - static void __net_exit nfnl_queue_net_exit(struct net *net) - { -+ struct nfnl_queue_net *q = nfnl_queue_pernet(net); -+ unsigned int i; -+ - nf_unregister_queue_handler(net); - #ifdef CONFIG_PROC_FS - remove_proc_entry("nfnetlink_queue", net->nf.proc_netfilter); - #endif -+ for (i = 0; i < INSTANCE_BUCKETS; i++) -+ WARN_ON_ONCE(!hlist_empty(&q->instance_table[i])); - } - - static void nfnl_queue_net_exit_batch(struct list_head *net_exit_list) ---- a/net/netfilter/x_tables.c -+++ b/net/netfilter/x_tables.c -@@ -1785,8 +1785,17 @@ static int __net_init xt_net_init(struct - return 0; - } - -+static void __net_exit xt_net_exit(struct net *net) -+{ -+ int i; -+ -+ for (i = 0; i < NFPROTO_NUMPROTO; i++) -+ WARN_ON_ONCE(!list_empty(&net->xt.tables[i])); -+} -+ - static struct pernet_operations xt_net_ops = { - .init = xt_net_init, -+ .exit = xt_net_exit, - }; - - static int __init xt_init(void) |