diff options
| author | David S. Miller | 2019-06-28 22:36:43 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-06-28 22:36:43 +0200 |
| commit | 7c3d310d8fc44e549f0ac77b2cc4bc796419e38b (patch) | |
| tree | 7b2f8e23ef2376670884e7195bc44b4c440fe442 /include/net | |
| parent | net: dsa: b53: Disable all ports on setup (diff) | |
| parent | netfilter: Fix remainder of pseudo-header protocol 0 (diff) | |
| download | kernel-qcow2-linux-7c3d310d8fc44e549f0ac77b2cc4bc796419e38b.tar.gz kernel-qcow2-linux-7c3d310d8fc44e549f0ac77b2cc4bc796419e38b.tar.xz kernel-qcow2-linux-7c3d310d8fc44e549f0ac77b2cc4bc796419e38b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter/IPVS fixes for net
The following patchset contains Netfilter fixes for net:
1) Fix memleak reported by syzkaller when registering IPVS hooks,
patch from Julian Anastasov.
2) Fix memory leak in start_sync_thread, also from Julian.
3) Fix conntrack deletion via ctnetlink, from Felix Kaechele.
4) Fix reject for ICMP due to incorrect checksum handling, from
He Zhe.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip_vs.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 2ac40135b576..b36a1df93e7c 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -808,11 +808,12 @@ struct ipvs_master_sync_state { struct ip_vs_sync_buff *sync_buff; unsigned long sync_queue_len; unsigned int sync_queue_delay; - struct task_struct *master_thread; struct delayed_work master_wakeup_work; struct netns_ipvs *ipvs; }; +struct ip_vs_sync_thread_data; + /* How much time to keep dests in trash */ #define IP_VS_DEST_TRASH_PERIOD (120 * HZ) @@ -943,7 +944,8 @@ struct netns_ipvs { spinlock_t sync_lock; struct ipvs_master_sync_state *ms; spinlock_t sync_buff_lock; - struct task_struct **backup_threads; + struct ip_vs_sync_thread_data *master_tinfo; + struct ip_vs_sync_thread_data *backup_tinfo; int threads_mask; volatile int sync_state; struct mutex sync_mutex; |