netfilter: xt_TCPOPTSTRIP: signed tcphoff for ipv6_skip_exthdr() retval

[safe/jmp/linux-2.6] / net / ax25 / ax25_in.c

diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c
index 0ddaff0..33790a8 100644 (file)
--- a/net/ax25/ax25_in.c
+++ b/net/ax25/ax25_in.c
@@ -124,7 +124,7 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb)
                }
 
                skb_pull(skb, 1);       /* Remove PID */
-               skb_reset_mac_header(skb);
+               skb->mac_header = skb->network_header;
                skb_reset_network_header(skb);
                skb->dev      = ax25->ax25_dev->dev;
                skb->pkt_type = PACKET_HOST;
@@ -451,6 +451,11 @@ int ax25_kiss_rcv(struct sk_buff *skb, struct net_device *dev,
        skb->sk = NULL;         /* Initially we don't know who it's for */
        skb->destructor = NULL; /* Who initializes this, dammit?! */
 
+       if (dev_net(dev) != &init_net) {
+               kfree_skb(skb);
+               return 0;
+       }
+
        if ((*skb->data & 0x0F) != 0) {
                kfree_skb(skb); /* Not a KISS data frame */
                return 0;