mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
[PATCH] revert nf_reset change
[NETFILTER]: Revert nf_reset change Revert the nf_reset change that caused so much trouble, drop conntrack references manually before packets are queued to packet sockets. Adapted for 2.6.12 by Daniel Drake <dsd@gentoo.org> Signed-off-by: Phil Oester <kernel@linuxace.com> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
2ae54a329f
commit
08cfcb785b
3 changed files with 13 additions and 3 deletions
|
@ -111,7 +111,6 @@ static int ip_dev_loopback_xmit(struct sk_buff *newskb)
|
||||||
#ifdef CONFIG_NETFILTER_DEBUG
|
#ifdef CONFIG_NETFILTER_DEBUG
|
||||||
nf_debug_ip_loopback_xmit(newskb);
|
nf_debug_ip_loopback_xmit(newskb);
|
||||||
#endif
|
#endif
|
||||||
nf_reset(newskb);
|
|
||||||
netif_rx(newskb);
|
netif_rx(newskb);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -196,8 +195,6 @@ static inline int ip_finish_output2(struct sk_buff *skb)
|
||||||
nf_debug_ip_finish_output2(skb);
|
nf_debug_ip_finish_output2(skb);
|
||||||
#endif /*CONFIG_NETFILTER_DEBUG*/
|
#endif /*CONFIG_NETFILTER_DEBUG*/
|
||||||
|
|
||||||
nf_reset(skb);
|
|
||||||
|
|
||||||
if (hh) {
|
if (hh) {
|
||||||
int hh_alen;
|
int hh_alen;
|
||||||
|
|
||||||
|
|
|
@ -432,6 +432,13 @@ static unsigned int ip_conntrack_defrag(unsigned int hooknum,
|
||||||
const struct net_device *out,
|
const struct net_device *out,
|
||||||
int (*okfn)(struct sk_buff *))
|
int (*okfn)(struct sk_buff *))
|
||||||
{
|
{
|
||||||
|
#if !defined(CONFIG_IP_NF_NAT) && !defined(CONFIG_IP_NF_NAT_MODULE)
|
||||||
|
/* Previously seen (loopback)? Ignore. Do this before
|
||||||
|
fragment check. */
|
||||||
|
if ((*pskb)->nfct)
|
||||||
|
return NF_ACCEPT;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Gather fragments. */
|
/* Gather fragments. */
|
||||||
if ((*pskb)->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) {
|
if ((*pskb)->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) {
|
||||||
*pskb = ip_ct_gather_frags(*pskb,
|
*pskb = ip_ct_gather_frags(*pskb,
|
||||||
|
|
|
@ -274,6 +274,9 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, struct
|
||||||
dst_release(skb->dst);
|
dst_release(skb->dst);
|
||||||
skb->dst = NULL;
|
skb->dst = NULL;
|
||||||
|
|
||||||
|
/* drop conntrack reference */
|
||||||
|
nf_reset(skb);
|
||||||
|
|
||||||
spkt = (struct sockaddr_pkt*)skb->cb;
|
spkt = (struct sockaddr_pkt*)skb->cb;
|
||||||
|
|
||||||
skb_push(skb, skb->data-skb->mac.raw);
|
skb_push(skb, skb->data-skb->mac.raw);
|
||||||
|
@ -517,6 +520,9 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
|
||||||
dst_release(skb->dst);
|
dst_release(skb->dst);
|
||||||
skb->dst = NULL;
|
skb->dst = NULL;
|
||||||
|
|
||||||
|
/* drop conntrack reference */
|
||||||
|
nf_reset(skb);
|
||||||
|
|
||||||
spin_lock(&sk->sk_receive_queue.lock);
|
spin_lock(&sk->sk_receive_queue.lock);
|
||||||
po->stats.tp_packets++;
|
po->stats.tp_packets++;
|
||||||
__skb_queue_tail(&sk->sk_receive_queue, skb);
|
__skb_queue_tail(&sk->sk_receive_queue, skb);
|
||||||
|
|
Loading…
Reference in a new issue