Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c98d80ed authored by Julian Anastasov's avatar Julian Anastasov Committed by Arnaldo Carvalho de Melo
Browse files

[SK_BUFF]: ipvs_property field must be copied 



IPVS used flag NFC_IPVS_PROPERTY in nfcache but as now nfcache was removed the
new flag 'ipvs_property' still needs to be copied. This patch should be
included in 2.6.14.

Further comments from Harald Welte:

Sorry, seems like the bug was introduced by me.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent 63172cb3

net/core/skbuff.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -410,6 +410,9 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask) 
	C(nfct);

	C(nfct);

	nf_conntrack_get(skb->nfct);

	nf_conntrack_get(skb->nfct);

	C(nfctinfo);

	C(nfctinfo);

#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)

	C(ipvs_property);

#endif

#ifdef CONFIG_BRIDGE_NETFILTER

#ifdef CONFIG_BRIDGE_NETFILTER

	C(nf_bridge);

	C(nf_bridge);

	nf_bridge_get(skb->nf_bridge);

	nf_bridge_get(skb->nf_bridge);
@@ -467,6 +470,9 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old) 
	new->nfct	= old->nfct;

	new->nfct	= old->nfct;

	nf_conntrack_get(old->nfct);

	nf_conntrack_get(old->nfct);

	new->nfctinfo	= old->nfctinfo;

	new->nfctinfo	= old->nfctinfo;

#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)

	new->ipvs_property = old->ipvs_property;

#endif

#ifdef CONFIG_BRIDGE_NETFILTER

#ifdef CONFIG_BRIDGE_NETFILTER

	new->nf_bridge	= old->nf_bridge;

	new->nf_bridge	= old->nf_bridge;

	nf_bridge_get(old->nf_bridge);

	nf_bridge_get(old->nf_bridge);

net/ipv4/ip_output.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -391,6 +391,9 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from) 
	to->nfct = from->nfct;

	to->nfct = from->nfct;

	nf_conntrack_get(to->nfct);

	nf_conntrack_get(to->nfct);

	to->nfctinfo = from->nfctinfo;

	to->nfctinfo = from->nfctinfo;

#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)

	to->ipvs_property = from->ipvs_property;

#endif

#ifdef CONFIG_BRIDGE_NETFILTER

#ifdef CONFIG_BRIDGE_NETFILTER

	nf_bridge_put(to->nf_bridge);

	nf_bridge_put(to->nf_bridge);

	to->nf_bridge = from->nf_bridge;

	to->nf_bridge = from->nf_bridge;