X-Git-Url: http://developer.intra2net.com/git/?p=ipt_ACCOUNT;a=blobdiff_plain;f=linux-2.6%2Fnet%2Fipv4%2Fnetfilter%2Fipt_ACCOUNT.c;h=a744381f30c49cbd1100d6019564c228504984e1;hp=5a5f03ffa5d6f67285c81503dcd58504d5a08251;hb=d0ba79b5f1fd7cd93975f976ba8332941ef0d198;hpb=32efca6f6d8fa23b3654a875a33fefa121982d08

diff --git a/linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c b/linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c
index 5a5f03f..a744381 100644
--- a/linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c
+++ b/linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c
@@ -3,7 +3,7 @@
  *   See http://www.intra2net.com/opensource/ipt_account                   *
  *   for further information                                               *
  *                                                                         * 
- *   Copyright (C) 2004-2006 by Intra2net AG                               *
+ *   Copyright (C) 2004-2007 by Intra2net AG                               *
  *   opensource@intra2net.com                                              *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -49,6 +49,18 @@ static DEFINE_SPINLOCK(ipt_acc_lock);
 /* Mutex (semaphore) used for manipulating userspace handles/snapshot data */
 static struct semaphore ipt_acc_userspace_mutex;
 
+/* Allocates a page and clears it */
+static void *ipt_acc_zalloc_page(void)
+{
+    // Don't use get_zeroed_page until it's fixed in the kernel.
+    // get_zeroed_page(GFP_ATOMIC)
+    void *mem = (void *)__get_free_page(GFP_ATOMIC);
+    if (mem) {
+        memset (mem, 0, PAGE_SIZE);
+    }
+
+    return mem;
+}
 
 /* Recursive free of all data structures */
 static void ipt_acc_data_free(void *data, unsigned char depth)
@@ -171,7 +183,7 @@ static int ipt_acc_table_insert(char *name, u_int32_t ip, u_int32_t netmask)
 
             ipt_acc_tables[i].refcount++;
             if ((ipt_acc_tables[i].data
-                = (void *)get_zeroed_page(GFP_ATOMIC)) == NULL) {
+                = ipt_acc_zalloc_page()) == NULL) {
                 printk("ACCOUNT: out of memory for data of table: %s\n", name);
                 memset(&ipt_acc_tables[i], 0, 
                        sizeof(struct ipt_acc_table));
@@ -373,7 +385,7 @@ static void ipt_acc_depth1_insert(struct ipt_acc_mask_16 *mask_16,
 
         /* Do we need to create a new mask_24 bucket? */
         if (!mask_16->mask_24[slot] && (mask_16->mask_24[slot] = 
-             (void *)get_zeroed_page(GFP_ATOMIC)) == NULL) {
+             ipt_acc_zalloc_page()) == NULL) {
             printk("ACCOUNT: Can't process packet because out of memory!\n");
             return;
         }
@@ -389,7 +401,7 @@ static void ipt_acc_depth1_insert(struct ipt_acc_mask_16 *mask_16,
 
         /* Do we need to create a new mask_24 bucket? */
         if (!mask_16->mask_24[slot] && (mask_16->mask_24[slot] 
-            = (void *)get_zeroed_page(GFP_ATOMIC)) == NULL) {
+            = ipt_acc_zalloc_page()) == NULL) {
             printk("ACCOUT: Can't process packet because out of memory!\n");
             return;
         }
@@ -411,7 +423,7 @@ static void ipt_acc_depth2_insert(struct ipt_acc_mask_8 *mask_8,
 
         /* Do we need to create a new mask_24 bucket? */
         if (!mask_8->mask_16[slot] && (mask_8->mask_16[slot] 
-            = (void *)get_zeroed_page(GFP_ATOMIC)) == NULL) {
+            = ipt_acc_zalloc_page()) == NULL) {
             printk("ACCOUNT: Can't process packet because out of memory!\n");
             return;
         }
@@ -427,7 +439,7 @@ static void ipt_acc_depth2_insert(struct ipt_acc_mask_8 *mask_8,
 
         /* Do we need to create a new mask_24 bucket? */
         if (!mask_8->mask_16[slot] && (mask_8->mask_16[slot] 
-            = (void *)get_zeroed_page(GFP_ATOMIC)) == NULL) {
+            = ipt_acc_zalloc_page()) == NULL) {
             printk("ACCOUNT: Can't process packet because out of memory!\n");
             return;
         }
@@ -591,7 +603,7 @@ static int ipt_acc_handle_prepare_read(char *tablename,
     dest->itemcount = ipt_acc_tables[table_nr].itemcount;
 
     /* allocate "root" table */
-    if ((dest->data = (void*)get_zeroed_page(GFP_ATOMIC)) == NULL) {
+    if ((dest->data = ipt_acc_zalloc_page()) == NULL) {
         printk("ACCOUNT: out of memory for root table "
                "in ipt_acc_handle_prepare_read()\n");
         return -1;
@@ -613,7 +625,7 @@ static int ipt_acc_handle_prepare_read(char *tablename,
         for (b = 0; b <= 255; b++) {
             if (src_16->mask_24[b]) {
                 if ((network_16->mask_24[b] = 
-                     (void*)get_zeroed_page(GFP_ATOMIC)) == NULL) {
+                     ipt_acc_zalloc_page()) == NULL) {
                     printk("ACCOUNT: out of memory during copy of 16 bit "
                            "network in ipt_acc_handle_prepare_read()\n");
                     ipt_acc_data_free(dest->data, depth);
@@ -635,7 +647,7 @@ static int ipt_acc_handle_prepare_read(char *tablename,
         for (a = 0; a <= 255; a++) {
             if (src_8->mask_16[a]) {
                 if ((network_8->mask_16[a] = 
-                     (void*)get_zeroed_page(GFP_ATOMIC)) == NULL) {
+                     ipt_acc_zalloc_page()) == NULL) {
                     printk("ACCOUNT: out of memory during copy of 24 bit network"
                            " in ipt_acc_handle_prepare_read()\n");
                     ipt_acc_data_free(dest->data, depth);
@@ -651,7 +663,7 @@ static int ipt_acc_handle_prepare_read(char *tablename,
                 for (b = 0; b <= 255; b++) {
                     if (src_16->mask_24[b]) {
                         if ((network_16->mask_24[b] = 
-                             (void*)get_zeroed_page(GFP_ATOMIC)) == NULL) {
+                             ipt_acc_zalloc_page()) == NULL) {
                             printk("ACCOUNT: out of memory during copy of 16 bit"
                                    " network in ipt_acc_handle_prepare_read()\n");
                             ipt_acc_data_free(dest->data, depth);
@@ -690,7 +702,7 @@ static int ipt_acc_handle_prepare_read_flush(char *tablename,
     }
 
     /* Try to allocate memory */
-    if (!(new_data_page = (void*)get_zeroed_page(GFP_ATOMIC))) {
+    if (!(new_data_page = ipt_acc_zalloc_page())) {
         printk("ACCOUNT: ipt_acc_handle_prepare_read_flush(): "
                "Out of memory!\n");
         return -1;
@@ -855,7 +867,7 @@ static int ipt_acc_set_ctl(struct sock *sk, int cmd,
     switch (cmd) {
     case IPT_SO_SET_ACCOUNT_HANDLE_FREE:
         if (len != sizeof(struct ipt_acc_handle_sockopt)) {
-            printk("ACCOUNT: ipt_acc_set_ctl: wrong data size (%u != %u) "
+            printk("ACCOUNT: ipt_acc_set_ctl: wrong data size (%u != %zu) "
                    "for IPT_SO_SET_HANDLE_FREE\n", 
                    len, sizeof(struct ipt_acc_handle_sockopt));
             break;
@@ -901,7 +913,7 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len)
             struct ipt_acc_handle dest;
 
             if (*len < sizeof(struct ipt_acc_handle_sockopt)) {
-                printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %u) "
+                printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %zu) "
                     "for IPT_SO_GET_ACCOUNT_PREPARE_READ/READ_FLUSH\n",
                     *len, sizeof(struct ipt_acc_handle_sockopt));
                 break;
@@ -946,7 +958,7 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len)
         }
     case IPT_SO_GET_ACCOUNT_GET_DATA:
         if (*len < sizeof(struct ipt_acc_handle_sockopt)) {
-            printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %u)"
+            printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %zu)"
                    " for IPT_SO_GET_ACCOUNT_PREPARE_READ/READ_FLUSH\n",
                    *len, sizeof(struct ipt_acc_handle_sockopt));
             break;
@@ -965,7 +977,7 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len)
 
         if (*len < ipt_acc_handles[handle.handle_nr].itemcount
                    * sizeof(struct ipt_acc_handle_ip)) {
-            printk("ACCOUNT: ipt_acc_get_ctl: not enough space (%u < %u)"
+            printk("ACCOUNT: ipt_acc_get_ctl: not enough space (%u < %zu)"
                    " to store data from IPT_SO_GET_ACCOUNT_GET_DATA\n",
                    *len, ipt_acc_handles[handle.handle_nr].itemcount
                    * sizeof(struct ipt_acc_handle_ip));
@@ -987,7 +999,7 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len)
     case IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE: {
             unsigned int i;
             if (*len < sizeof(struct ipt_acc_handle_sockopt)) {
-                printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %u)"
+                printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %zu)"
                        " for IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE\n",
                        *len, sizeof(struct ipt_acc_handle_sockopt));
                 break;