ipvs: correct usage/allocation of seqadj ext in ipvs
The IPVS FTP helper ip_vs_ftp could trigger an OOPS in nf_ct_seqadj_set, after commit41d73ec053
(netfilter: nf_conntrack: make sequence number adjustments usuable without NAT). This is because, the seqadj ext is now allocated dynamically, and the IPVS code didn't handle this situation. Fix this in the IPVS nfct code by invoking the alloc function nfct_seqadj_ext_add(). Fixes:41d73ec053
(netfilter: nf_conntrack: make sequence number adjustments usuable without NAT) Suggested-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Родитель
db12cf2743
Коммит
b25adce160
|
@ -63,6 +63,7 @@
|
|||
#include <net/ip_vs.h>
|
||||
#include <net/netfilter/nf_conntrack_core.h>
|
||||
#include <net/netfilter/nf_conntrack_expect.h>
|
||||
#include <net/netfilter/nf_conntrack_seqadj.h>
|
||||
#include <net/netfilter/nf_conntrack_helper.h>
|
||||
#include <net/netfilter/nf_conntrack_zones.h>
|
||||
|
||||
|
@ -97,6 +98,11 @@ ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, int outin)
|
|||
if (CTINFO2DIR(ctinfo) != IP_CT_DIR_ORIGINAL)
|
||||
return;
|
||||
|
||||
/* Applications may adjust TCP seqs */
|
||||
if (cp->app && nf_ct_protonum(ct) == IPPROTO_TCP &&
|
||||
!nfct_seqadj(ct) && !nfct_seqadj_ext_add(ct))
|
||||
return;
|
||||
|
||||
/*
|
||||
* The connection is not yet in the hashtable, so we update it.
|
||||
* CIP->VIP will remain the same, so leave the tuple in
|
||||
|
|
Загрузка…
Ссылка в новой задаче