[patch] fix ipt_ACCOUNT for 32bit netmasks

[patch] fix ipt_ACCOUNT for 32bit netmasks

[Thomas Jarosch]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

Hi,

attached is a patch to fix ipt_ACCOUNT for /32 netmasks.
While looking through the code I also found and fixed a locking bug.

Please apply the patch or let me know if there's trouble applying.

Cheers,
Thomas

[-- Attachment #2: ipt_ACCOUNT-32bitnetmask-fix.patch --]
[-- Type: text/x-diff, Size: 1075 bytes --]

Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>

diff -U3 -r1.32 -r1.34
--- ACCOUNT/linux/net/ipv4/netfilter/ipt_ACCOUNT.c	14 Apr 2005 20:55:52 -0000	1.32
+++ ACCOUNT/linux/net/ipv4/netfilter/ipt_ACCOUNT.c	13 May 2005 10:04:31 -0000	1.34
@@ -137,7 +137,8 @@
     for (i = 0; i < ACCOUNT_MAX_TABLES; i++) {
         /* Found free slot */
         if (ipt_acc_tables[i].name[0] == 0) {
-            u_int32_t j, calc_mask, netsize=0;
+            u_int32_t calc_mask, netsize=0;
+            int j;  /* needs to be signed, otherwise we risk endless loop */
             
             DEBUGP("ACCOUNT: Found free slot: %d\n", i);
             strncpy (ipt_acc_tables[i].name, name, ACCOUNT_TABLE_NAME_LEN-1);
@@ -890,6 +891,7 @@
             down(&ipt_acc_userspace_mutex);
             if ((handle.handle_nr = ipt_acc_handle_find_slot()) == -1) {
                 ipt_acc_data_free(dest.data, dest.depth);
+                up(&ipt_acc_userspace_mutex);
                 return -EINVAL;
             }
             memcpy(&ipt_acc_handles[handle.handle_nr], &dest,

Re: [patch] fix ipt_ACCOUNT for 32bit netmasks

[Patrick McHardy]

Thomas Jarosch wrote:
> Hi,
> 
> attached is a patch to fix ipt_ACCOUNT for /32 netmasks.
> While looking through the code I also found and fixed a locking bug.
> 
> Please apply the patch or let me know if there's trouble applying.

Applied, but I suggest to replace that code by ffz(~netmask).

Regards
Patrick