Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[powerpc.git] / net / netfilter / nf_queue.c

diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index bb6fcee..b1f2ace 100644 (file)
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -10,7 +10,7 @@
 
 #include "nf_internals.h"
 
-/* 
+/*
  * A queue handler may be registered for each protocol.  Each is protected by
  * long term mutex.  The handler must provide an an outfn() to accept packets
  * for queueing and must reinject all packets it receives, no matter what.
@@ -22,7 +22,7 @@ static DEFINE_RWLOCK(queue_handler_lock);
 /* return EBUSY when somebody else is registered, return EEXIST if the
  * same handler is registered, return 0 in case of success. */
 int nf_register_queue_handler(int pf, struct nf_queue_handler *qh)
-{      
+{
        int ret;
 
        if (pf >= NPROTO)
@@ -52,7 +52,7 @@ int nf_unregister_queue_handler(int pf)
        write_lock_bh(&queue_handler_lock);
        queue_handler[pf] = NULL;
        write_unlock_bh(&queue_handler_lock);
-       
+
        return 0;
 }
 EXPORT_SYMBOL(nf_unregister_queue_handler);
@@ -70,17 +70,17 @@ void nf_unregister_queue_handlers(struct nf_queue_handler *qh)
 }
 EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
 
-/* 
- * Any packet that leaves via this function must come back 
+/*
+ * Any packet that leaves via this function must come back
  * through nf_reinject().
  */
-int nf_queue(struct sk_buff **skb, 
-            struct list_head *elem, 
-            int pf, unsigned int hook,
-            struct net_device *indev,
-            struct net_device *outdev,
-            int (*okfn)(struct sk_buff *),
-            unsigned int queuenum)
+static int __nf_queue(struct sk_buff *skb,
+                     struct list_head *elem,
+                     int pf, unsigned int hook,
+                     struct net_device *indev,
+                     struct net_device *outdev,
+                     int (*okfn)(struct sk_buff *),
+                     unsigned int queuenum)
 {
        int status;
        struct nf_info *info;
@@ -94,14 +94,14 @@ int nf_queue(struct sk_buff **skb,
        read_lock(&queue_handler_lock);
        if (!queue_handler[pf]) {
                read_unlock(&queue_handler_lock);
-               kfree_skb(*skb);
+               kfree_skb(skb);
                return 1;
        }
 
        afinfo = nf_get_afinfo(pf);
        if (!afinfo) {
                read_unlock(&queue_handler_lock);
-               kfree_skb(*skb);
+               kfree_skb(skb);
                return 1;
        }
 
@@ -109,13 +109,13 @@ int nf_queue(struct sk_buff **skb,
        if (!info) {
                if (net_ratelimit())
                        printk(KERN_ERR "OOM queueing packet %p\n",
-                              *skb);
+                              skb);
                read_unlock(&queue_handler_lock);
-               kfree_skb(*skb);
+               kfree_skb(skb);
                return 1;
        }
 
-       *info = (struct nf_info) { 
+       *info = (struct nf_info) {
                (struct nf_hook_ops *)elem, pf, hook, indev, outdev, okfn };
 
        /* If it's going away, ignore hook. */
@@ -130,15 +130,15 @@ int nf_queue(struct sk_buff **skb,
        if (outdev) dev_hold(outdev);
 
 #ifdef CONFIG_BRIDGE_NETFILTER
-       if ((*skb)->nf_bridge) {
-               physindev = (*skb)->nf_bridge->physindev;
+       if (skb->nf_bridge) {
+               physindev = skb->nf_bridge->physindev;
                if (physindev) dev_hold(physindev);
-               physoutdev = (*skb)->nf_bridge->physoutdev;
+               physoutdev = skb->nf_bridge->physoutdev;
                if (physoutdev) dev_hold(physoutdev);
        }
 #endif
-       afinfo->saveroute(*skb, info);
-       status = queue_handler[pf]->outfn(*skb, info, queuenum,
+       afinfo->saveroute(skb, info);
+       status = queue_handler[pf]->outfn(skb, info, queuenum,
                                          queue_handler[pf]->data);
 
        read_unlock(&queue_handler_lock);
@@ -153,7 +153,7 @@ int nf_queue(struct sk_buff **skb,
 #endif
                module_put(info->elem->owner);
                kfree(info);
-               kfree_skb(*skb);
+               kfree_skb(skb);
 
                return 1;
        }
@@ -161,6 +161,46 @@ int nf_queue(struct sk_buff **skb,
        return 1;
 }
 
+int nf_queue(struct sk_buff *skb,
+            struct list_head *elem,
+            int pf, unsigned int hook,
+            struct net_device *indev,
+            struct net_device *outdev,
+            int (*okfn)(struct sk_buff *),
+            unsigned int queuenum)
+{
+       struct sk_buff *segs;
+
+       if (!skb_is_gso(skb))
+               return __nf_queue(skb, elem, pf, hook, indev, outdev, okfn,
+                                 queuenum);
+
+       switch (pf) {
+       case AF_INET:
+               skb->protocol = htons(ETH_P_IP);
+               break;
+       case AF_INET6:
+               skb->protocol = htons(ETH_P_IPV6);
+               break;
+       }
+
+       segs = skb_gso_segment(skb, 0);
+       kfree_skb(skb);
+       if (unlikely(IS_ERR(segs)))
+               return 1;
+
+       do {
+               struct sk_buff *nskb = segs->next;
+
+               segs->next = NULL;
+               if (!__nf_queue(segs, elem, pf, hook, indev, outdev, okfn,
+                               queuenum))
+                       kfree_skb(segs);
+               segs = nskb;
+       } while (segs);
+       return 1;
+}
+
 void nf_reinject(struct sk_buff *skb, struct nf_info *info,
                 unsigned int verdict)
 {
@@ -186,10 +226,10 @@ void nf_reinject(struct sk_buff *skb, struct nf_info *info,
        module_put(info->elem->owner);
 
        list_for_each_rcu(i, &nf_hooks[info->pf][info->hook]) {
-               if (i == elem) 
-                       break;
-       }
-  
+               if (i == elem)
+                       break;
+       }
+
        if (i == &nf_hooks[info->pf][info->hook]) {
                /* The module which sent it to userspace is gone. */
                NFDEBUG("%s: module disappeared, dropping packet.\n",
@@ -212,28 +252,27 @@ void nf_reinject(struct sk_buff *skb, struct nf_info *info,
        if (verdict == NF_ACCEPT) {
        next_hook:
                verdict = nf_iterate(&nf_hooks[info->pf][info->hook],
-                                    &skb, info->hook, 
+                                    &skb, info->hook,
                                     info->indev, info->outdev, &elem,
                                     info->okfn, INT_MIN);
        }
 
        switch (verdict & NF_VERDICT_MASK) {
        case NF_ACCEPT:
+       case NF_STOP:
                info->okfn(skb);
+       case NF_STOLEN:
                break;
-
        case NF_QUEUE:
-               if (!nf_queue(&skb, elem, info->pf, info->hook, 
-                             info->indev, info->outdev, info->okfn,
-                             verdict >> NF_VERDICT_BITS))
+               if (!__nf_queue(skb, elem, info->pf, info->hook,
+                               info->indev, info->outdev, info->okfn,
+                               verdict >> NF_VERDICT_BITS))
                        goto next_hook;
                break;
+       default:
+               kfree_skb(skb);
        }
        rcu_read_unlock();
-
-       if (verdict == NF_DROP)
-               kfree_skb(skb);
-
        kfree(info);
        return;
 }
@@ -292,7 +331,7 @@ static int nfqueue_open(struct inode *inode, struct file *file)
        return seq_open(file, &nfqueue_seq_ops);
 }
 
-static struct file_operations nfqueue_file_ops = {
+static const struct file_operations nfqueue_file_ops = {
        .owner   = THIS_MODULE,
        .open    = nfqueue_open,
        .read    = seq_read,