X-Git-Url: http://developer.intra2net.com/git/?p=ipt_ACCOUNT;a=blobdiff_plain;f=linux%2Fnet%2Fipv4%2Fnetfilter%2Fipt_ACCOUNT.c;h=c22b419577616eecf50a13b7a50b2e421dc93516;hp=430524db5a0efc4b05a39da4f4ce1f06cdef897a;hb=e1b6610133ec95a8f6e83f963c322ae8a8e17c02;hpb=2ea7a43c53135e9a57555112a4e49e3617c8c419 diff --git a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c index 430524d..c22b419 100644 --- a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c +++ b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c @@ -31,6 +31,10 @@ struct in_device; #define DEBUGP(format, args...) #endif +#if (PAGE_SIZE < 4096) +#error "ipt_ACCOUNT needs at least a PAGE_SIZE of 4096" +#endif + struct ipt_account_table *ipt_account_tables = NULL; struct ipt_account_handle *ipt_account_handles = NULL; void *ipt_account_tmpbuf = NULL; @@ -42,19 +46,20 @@ static spinlock_t ipt_account_userspace_lock = SPIN_LOCK_UNLOCKED; /* Recursive free of all data structures */ -void ipt_account_data_free(void *data, unsigned char depth) { +void ipt_account_data_free(void *data, unsigned char depth) +{ /* Empty data set */ if (!data) return; - // Free for 8 bit network + /* Free for 8 bit network */ if (depth == 0) { free_page((unsigned long)data); data = NULL; return; } - // Free for 16 bit network + /* Free for 16 bit network */ if (depth == 1) { struct ipt_account_mask_16 *mask_16 = (struct ipt_account_mask_16 *)data; unsigned int b; @@ -69,12 +74,14 @@ void ipt_account_data_free(void *data, unsigned char depth) { return; } - // Free for 24 bit network + /* Free for 24 bit network */ if (depth == 3) { unsigned int a, b; for (a=0; a <= 255; a++) { if (((struct ipt_account_mask_8 *)data)->mask_16[a]) { - struct ipt_account_mask_16 *mask_16 = (struct ipt_account_mask_16*)((struct ipt_account_mask_8 *)data)->mask_16[a]; + struct ipt_account_mask_16 *mask_16 = (struct ipt_account_mask_16*) + ((struct ipt_account_mask_8 *)data)->mask_16[a]; + for (b=0; b <= 255; b++) { if (mask_16->mask_24[b]) { free_page((unsigned long)mask_16->mask_24[b]); @@ -95,19 +102,21 @@ void ipt_account_data_free(void *data, unsigned char depth) { } /* Look for existing table / insert new one. Return internal ID or -1 on error */ -int ipt_account_table_insert(char *name, unsigned int ip, unsigned int netmask) { +int ipt_account_table_insert(char *name, unsigned int ip, unsigned int netmask) +{ unsigned int i; - DEBUGP("ACCOUNT: ipt_account_table_insert: %s, %u.%u.%u.%u/%u.%u.%u.%u\n", name, NIPQUAD(ip), NIPQUAD(netmask)); + DEBUGP("ACCOUNT: ipt_account_table_insert: %s, %u.%u.%u.%u/%u.%u.%u.%u\n", + name, NIPQUAD(ip), NIPQUAD(netmask)); - // Look for existing table + /* Look for existing table */ for (i = 0; i < ACCOUNT_MAX_TABLES; i++) { if (strncmp(ipt_account_tables[i].name, name, ACCOUNT_TABLE_NAME_LEN) == 0) { DEBUGP("ACCOUNT: Found existing slot: %d - %u.%u.%u.%u/%u.%u.%u.%u\n", i, NIPQUAD(ipt_account_tables[i].ip), NIPQUAD(ipt_account_tables[i].netmask)); if (ipt_account_tables[i].ip != ip || ipt_account_tables[i].netmask != netmask) { - printk("ACCOUNT: Table %s found, but IP/netmask mismatch. IP/netmask found: %u.%u.%u.%u/%u.%u.%u.%u\n", + printk("ACCOUNT: Table %s found, but IP/netmask mismatch. IP/netmask found: %u.%u.%u.%u/%u.%u.%u.%u\n", name, NIPQUAD(ipt_account_tables[i].ip), NIPQUAD(ipt_account_tables[i].netmask)); return -1; } @@ -118,9 +127,9 @@ int ipt_account_table_insert(char *name, unsigned int ip, unsigned int netmask) } } - // Insert new table + /* Insert new table */ for (i = 0; i < ACCOUNT_MAX_TABLES; i++) { - // Found free slot + /* Found free slot */ if (ipt_account_tables[i].name[0] == 0) { DEBUGP("ACCOUNT: Found free slot: %d\n", i); @@ -129,7 +138,7 @@ int ipt_account_table_insert(char *name, unsigned int ip, unsigned int netmask) ipt_account_tables[i].ip = ip; ipt_account_tables[i].netmask = netmask; - // Calculate netsize + /* Calculate netsize */ unsigned int j, calc_mask, netsize=0; calc_mask = htonl(netmask); for (j = 31; j > 0; j--) { @@ -139,7 +148,7 @@ int ipt_account_table_insert(char *name, unsigned int ip, unsigned int netmask) break; } - // Calculate depth from netsize + /* Calculate depth from netsize */ if (netsize >= 24) ipt_account_tables[i].depth = 0; else if (netsize >= 16) @@ -147,10 +156,11 @@ int ipt_account_table_insert(char *name, unsigned int ip, unsigned int netmask) else if(netsize >= 8) ipt_account_tables[i].depth = 2; - printk("ACCOUNT: calculated netsize: %u -> ipt_account_table depth %u\n", netsize, ipt_account_tables[i].depth); + DEBUGP("ACCOUNT: calculated netsize: %u -> ipt_account_table depth %u\n", + netsize, ipt_account_tables[i].depth); ipt_account_tables[i].refcount++; - if ((ipt_account_tables[i].data = (void *)get_zeroed_page(GFP_KERNEL)) == NULL) { + if ((ipt_account_tables[i].data = (void *)get_zeroed_page(GFP_ATOMIC)) == NULL) { printk("ACCOUNT: out of memory for data of table: %s\n", name); memset(&ipt_account_tables[i], 0, sizeof(struct ipt_account_table)); return -1; @@ -160,7 +170,7 @@ int ipt_account_table_insert(char *name, unsigned int ip, unsigned int netmask) } } - // No free slot found + /* No free slot found */ printk("ACCOUNT: No free table slot found (max: %d). Please increase ACCOUNT_MAX_TABLES.\n", ACCOUNT_MAX_TABLES); return -1; } @@ -169,7 +179,8 @@ static int ipt_account_checkentry(const char *tablename, const struct ipt_entry *e, void *targinfo, unsigned int targinfosize, - unsigned int hook_mask) { + unsigned int hook_mask) +{ struct ipt_account_info *info = targinfo; if (targinfosize != IPT_ALIGN(sizeof(struct ipt_account_info))) { @@ -185,7 +196,7 @@ static int ipt_account_checkentry(const char *tablename, spin_unlock_bh(&ipt_account_lock); return 0; } - // Table nr caching so we don't have to do an extra string compare for every packet + /* Table nr caching so we don't have to do an extra string compare for every packet */ info->table_nr = table_nr; spin_unlock_bh(&ipt_account_lock); @@ -193,7 +204,8 @@ static int ipt_account_checkentry(const char *tablename, return 1; } -void ipt_account_deleteentry(void *targinfo, unsigned int targinfosize) { +void ipt_account_deleteentry(void *targinfo, unsigned int targinfosize) +{ unsigned int i; struct ipt_account_info *info = targinfo; @@ -206,9 +218,9 @@ void ipt_account_deleteentry(void *targinfo, unsigned int targinfosize) { DEBUGP("ACCOUNT: ipt_account_deleteentry called for table: %s (#%d)\n", info->table_name, info->table_nr); - info->table_nr = -1; // Set back to original state + info->table_nr = -1; /* Set back to original state */ - // Look for table + /* Look for table */ for (i = 0; i < ACCOUNT_MAX_TABLES; i++) { if (strncmp(ipt_account_tables[i].name, info->table_name, ACCOUNT_TABLE_NAME_LEN) == 0) { DEBUGP("ACCOUNT: Found table at slot: %d\n", i); @@ -216,7 +228,7 @@ void ipt_account_deleteentry(void *targinfo, unsigned int targinfosize) { ipt_account_tables[i].refcount--; DEBUGP("ACCOUNT: Refcount left: %d\n", ipt_account_tables[i].refcount); - // Table not needed anymore? + /* Table not needed anymore? */ if (ipt_account_tables[i].refcount == 0) { DEBUGP("ACCOUNT: Destroying table at slot: %d\n", i); ipt_account_data_free(ipt_account_tables[i].data, ipt_account_tables[i].depth); @@ -228,20 +240,23 @@ void ipt_account_deleteentry(void *targinfo, unsigned int targinfosize) { } } - // Table not found + /* Table not found */ printk("ACCOUNT: Table %s not found for destroy\n", info->table_name); spin_unlock_bh(&ipt_account_lock); } -void ipt_account_depth0_insert(struct ipt_account_mask_24 *mask_24, unsigned int net_ip, unsigned int netmask, - unsigned int src_ip, unsigned int dst_ip, unsigned int size, unsigned int *itemcount) { +void ipt_account_depth0_insert(struct ipt_account_mask_24 *mask_24, + unsigned int net_ip, unsigned int netmask, + unsigned int src_ip, unsigned int dst_ip, + unsigned int size, unsigned int *itemcount) +{ unsigned char is_src = 0, is_dst = 0; DEBUGP("ACCOUNT: ipt_account_depth0_insert: %u.%u.%u.%u/%u.%u.%u.%u for net %u.%u.%u.%u/%u.%u.%u.%u, size: %u\n", NIPQUAD(src_ip), NIPQUAD(dst_ip), NIPQUAD(net_ip), NIPQUAD(netmask), size); - // Check if src/dst is inside our network. - // Special: net_ip = 0.0.0.0/0 gets stored as src in slot 0 + /* Check if src/dst is inside our network. */ + /* Special: net_ip = 0.0.0.0/0 gets stored as src in slot 0 */ if (!netmask) src_ip = 0; if ((net_ip&netmask) == (src_ip&netmask)) @@ -255,16 +270,16 @@ void ipt_account_depth0_insert(struct ipt_account_mask_24 *mask_24, unsigned int return; } - // Check if this entry is new + /* Check if this entry is new */ char is_src_new_ip = 0, is_dst_new_ip = 0; - // Calculate array positions + /* Calculate array positions */ unsigned char src_slot = (unsigned char)((src_ip&0xFF000000) >> 24); unsigned char dst_slot = (unsigned char)((dst_ip&0xFF000000) >> 24); - // Increase size counters + /* Increase size counters */ if (is_src) { - // Calculate network slot + /* Calculate network slot */ DEBUGP("ACCOUNT: Calculated SRC 8 bit network slot: %d\n", src_slot); if (!mask_24->ip[src_slot].src_packets && !mask_24->ip[src_slot].dst_packets) is_src_new_ip = 1; @@ -281,7 +296,7 @@ void ipt_account_depth0_insert(struct ipt_account_mask_24 *mask_24, unsigned int mask_24->ip[dst_slot].dst_bytes+=size; } - // Increase itemcounter + /* Increase itemcounter */ DEBUGP("ACCOUNT: Itemcounter before: %d\n", *itemcount); if (src_slot == dst_slot) { if (is_src_new_ip || is_dst_new_ip) { @@ -301,15 +316,17 @@ void ipt_account_depth0_insert(struct ipt_account_mask_24 *mask_24, unsigned int DEBUGP("ACCOUNT: Itemcounter after: %d\n", *itemcount); } -void ipt_account_depth1_insert(struct ipt_account_mask_16 *mask_16, unsigned int net_ip, unsigned int netmask, - unsigned int src_ip, unsigned int dst_ip, unsigned int size, unsigned int *itemcount) { - // Do we need to process src IP? +void ipt_account_depth1_insert(struct ipt_account_mask_16 *mask_16, unsigned int net_ip, + unsigned int netmask, unsigned int src_ip, unsigned int dst_ip, + unsigned int size, unsigned int *itemcount) +{ + /* Do we need to process src IP? */ if ((net_ip&netmask) == (src_ip&netmask)) { unsigned char slot = (unsigned char)((src_ip&0x00FF0000) >> 16); DEBUGP("ACCOUNT: Calculated SRC 16 bit network slot: %d\n", slot); - // 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_KERNEL)) == NULL) { + /* 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) { printk("ACCOUNT: Can't process packet because out of memory!\n"); return; } @@ -318,13 +335,13 @@ void ipt_account_depth1_insert(struct ipt_account_mask_16 *mask_16, unsigned int src_ip, 0, size, itemcount); } - // Do we need to process dst IP? + /* Do we need to process dst IP? */ if ((net_ip&netmask) == (dst_ip&netmask)) { unsigned char slot = (unsigned char)((dst_ip&0x00FF0000) >> 16); DEBUGP("ACCOUNT: Calculated DST 16 bit network slot: %d\n", slot); - // 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_KERNEL)) == NULL) { + /* 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) { printk("ACCOUT: Can't process packet because out of memory!\n"); return; } @@ -334,15 +351,17 @@ void ipt_account_depth1_insert(struct ipt_account_mask_16 *mask_16, unsigned int } } -void ipt_account_depth2_insert(struct ipt_account_mask_8 *mask_8, unsigned int net_ip, unsigned int netmask, - unsigned int src_ip, unsigned int dst_ip, unsigned int size, unsigned int *itemcount) { - // Do we need to process src IP? +void ipt_account_depth2_insert(struct ipt_account_mask_8 *mask_8, unsigned int net_ip, + unsigned int netmask, unsigned int src_ip, unsigned int dst_ip, + unsigned int size, unsigned int *itemcount) +{ + /* Do we need to process src IP? */ if ((net_ip&netmask) == (src_ip&netmask)) { unsigned char slot = (unsigned char)((src_ip&0x0000FF00) >> 8); DEBUGP("ACCOUNT: Calculated SRC 24 bit network slot: %d\n", slot); - // 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_KERNEL)) == NULL) { + /* 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) { printk("ACCOUNT: Can't process packet because out of memory!\n"); return; } @@ -351,13 +370,13 @@ void ipt_account_depth2_insert(struct ipt_account_mask_8 *mask_8, unsigned int n src_ip, 0, size, itemcount); } - // Do we need to process dst IP? + /* Do we need to process dst IP? */ if ((net_ip&netmask) == (dst_ip&netmask)) { unsigned char slot = (unsigned char)((dst_ip&0x0000FF00) >> 8); DEBUGP("ACCOUNT: Calculated DST 24 bit network slot: %d\n", slot); - // 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_KERNEL)) == NULL) { + /* 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) { printk("ACCOUNT: Can't process packet because out of memory!\n"); return; } @@ -372,7 +391,8 @@ static unsigned int ipt_account_target(struct sk_buff **pskb, const struct net_device *in, const struct net_device *out, const void *targinfo, - void *userinfo) { + void *userinfo) +{ const struct ipt_account_info *info = (const struct ipt_account_info *)targinfo; unsigned int src_ip = (*pskb)->nh.iph->saddr; unsigned int dst_ip = (*pskb)->nh.iph->daddr; @@ -387,9 +407,9 @@ static unsigned int ipt_account_target(struct sk_buff **pskb, return IPT_CONTINUE; } - // 8 bit network or "any" network + /* 8 bit network or "any" network */ if (ipt_account_tables[info->table_nr].depth == 0) { - // Count packet and check if the IP is new + /* Count packet and check if the IP is new */ ipt_account_depth0_insert((struct ipt_account_mask_24 *)ipt_account_tables[info->table_nr].data, ipt_account_tables[info->table_nr].ip, ipt_account_tables[info->table_nr].netmask, src_ip, dst_ip, size, &ipt_account_tables[info->table_nr].itemcount); @@ -397,7 +417,7 @@ static unsigned int ipt_account_target(struct sk_buff **pskb, return IPT_CONTINUE; } - // 16 bit network + /* 16 bit network */ if (ipt_account_tables[info->table_nr].depth == 1) { ipt_account_depth1_insert((struct ipt_account_mask_16 *)ipt_account_tables[info->table_nr].data, ipt_account_tables[info->table_nr].ip, ipt_account_tables[info->table_nr].netmask, @@ -406,7 +426,7 @@ static unsigned int ipt_account_target(struct sk_buff **pskb, return IPT_CONTINUE; } - // 24 bit network + /* 24 bit network */ if (ipt_account_tables[info->table_nr].depth == 2) { ipt_account_depth2_insert((struct ipt_account_mask_8 *)ipt_account_tables[info->table_nr].data, ipt_account_tables[info->table_nr].ip, ipt_account_tables[info->table_nr].netmask, @@ -439,24 +459,26 @@ static unsigned int ipt_account_target(struct sk_buff **pskb, but there could be two or more applications accessing the data at the same time. */ -int ipt_account_handle_find_slot(void) { +int ipt_account_handle_find_slot(void) +{ unsigned int i; - // Insert new table + /* Insert new table */ for (i = 0; i < ACCOUNT_MAX_HANDLES; i++) { - // Found free slot + /* Found free slot */ if (ipt_account_handles[i].data == NULL) { - // Don't "mark" data as used as we are protected by a spinlock by the calling function. - // handle_find_slot() is only a function to prevent code duplication. + /* Don't "mark" data as used as we are protected by a spinlock by the calling function. */ + /* handle_find_slot() is only a function to prevent code duplication. */ return i; } } - // No free slot found + /* No free slot found */ printk("ACCOUNT: No free handle slot found (max: %u). Please increase ACCOUNT_MAX_HANDLES.\n", ACCOUNT_MAX_HANDLES); return -1; } -int ipt_account_handle_free(unsigned int handle) { +int ipt_account_handle_free(unsigned int handle) +{ if (handle >= ACCOUNT_MAX_HANDLES) { printk("ACCOUNT: Invalid handle for ipt_account_handle_free() specified: %u\n", handle); return -EINVAL; @@ -469,7 +491,8 @@ int ipt_account_handle_free(unsigned int handle) { /* Prepare data for read without flush. Use only for debugging! Real applications should use read&flush as it's way more efficent */ -int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) { +int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) +{ int handle, i, table_nr=-1; for (i = 0; i < ACCOUNT_MAX_TABLES; i++) @@ -483,23 +506,23 @@ int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) { return -1; } - // Can't find a free handle slot? + /* Can't find a free handle slot? */ if ((handle = ipt_account_handle_find_slot()) == -1) return -1; - // Fill up handle structure + /* Fill up handle structure */ ipt_account_handles[handle].ip = ipt_account_tables[table_nr].ip; ipt_account_handles[handle].depth = ipt_account_tables[table_nr].depth; ipt_account_handles[handle].itemcount = ipt_account_tables[table_nr].itemcount; - // allocate "root" table - if ((ipt_account_handles[handle].data = (void*)get_zeroed_page(GFP_KERNEL)) == NULL) { + /* allocate "root" table */ + if ((ipt_account_handles[handle].data = (void*)get_zeroed_page(GFP_ATOMIC)) == NULL) { printk("ACCOUNT: out of memory for root table in ipt_account_handle_prepare_read()\n"); memset (&ipt_account_handles[handle], 0, sizeof(struct ipt_account_handle)); return -1; } - // Recursive copy of complete data structure + /* Recursive copy of complete data structure */ unsigned int depth = ipt_account_handles[handle].depth; if (depth == 0) { memcpy(ipt_account_handles[handle].data, ipt_account_tables[table_nr].data, sizeof(struct ipt_account_mask_24)); @@ -510,7 +533,7 @@ int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) { for (b = 0; b <= 255; b++) { if (src_16->mask_24[b]) { - if ((network_16->mask_24[b] = (void*)get_zeroed_page(GFP_KERNEL)) == NULL) { + if ((network_16->mask_24[b] = (void*)get_zeroed_page(GFP_ATOMIC)) == NULL) { printk("ACCOUNT: out of memory during copy of 16 bit network in ipt_account_handle_prepare_read()\n"); ipt_account_data_free(ipt_account_handles[handle].data, depth); memset (&ipt_account_handles[handle], 0, sizeof(struct ipt_account_handle)); @@ -527,7 +550,7 @@ int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) { for (a = 0; a <= 255; a++) { if (src_8->mask_16[a]) { - if ((network_8->mask_16[a] = (void*)get_zeroed_page(GFP_KERNEL)) == NULL) { + if ((network_8->mask_16[a] = (void*)get_zeroed_page(GFP_ATOMIC)) == NULL) { printk("ACCOUNT: out of memory during copy of 24 bit network in ipt_account_handle_prepare_read()\n"); ipt_account_data_free(ipt_account_handles[handle].data, depth); memset (&ipt_account_handles[handle], 0, sizeof(struct ipt_account_handle)); @@ -542,7 +565,7 @@ int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) { for (b = 0; b <= 255; b++) { if (src_16->mask_24[b]) { - if ((network_16->mask_24[b] = (void*)get_zeroed_page(GFP_KERNEL)) == NULL) { + if ((network_16->mask_24[b] = (void*)get_zeroed_page(GFP_ATOMIC)) == NULL) { printk("ACCOUNT: out of memory during copy of 16 bit network in ipt_account_handle_prepare_read()\n"); ipt_account_data_free(ipt_account_handles[handle].data, depth); memset (&ipt_account_handles[handle], 0, sizeof(struct ipt_account_handle)); @@ -561,7 +584,8 @@ int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) { } /* Prepare data for read and flush it */ -int ipt_account_handle_prepare_read_flush(char *tablename, unsigned int *count) { +int ipt_account_handle_prepare_read_flush(char *tablename, unsigned int *count) +{ int handle, i, table_nr=-1; for (i = 0; i < ACCOUNT_MAX_TABLES; i++) @@ -575,32 +599,70 @@ int ipt_account_handle_prepare_read_flush(char *tablename, unsigned int *count) return -1; } - // Can't find a free handle slot? + /* Can't find a free handle slot? */ if ((handle = ipt_account_handle_find_slot()) == -1) return -1; - // Fill up handle structure + /* Try to allocate memory */ + void *new_data_page = (void*)get_zeroed_page(GFP_ATOMIC); + if (!new_data_page) + { + printk("ACCOUNT: ipt_account_handle_prepare_read_flush(): Out of memory!\n"); + return -1; + } + + /* Fill up handle structure */ ipt_account_handles[handle].ip = ipt_account_tables[table_nr].ip; ipt_account_handles[handle].depth = ipt_account_tables[table_nr].depth; ipt_account_handles[handle].itemcount = ipt_account_tables[table_nr].itemcount; ipt_account_handles[handle].data = ipt_account_tables[table_nr].data; *count = ipt_account_tables[table_nr].itemcount; - // "Flush" table data - ipt_account_tables[table_nr].data = (void*)get_zeroed_page(GFP_KERNEL); + /* "Flush" table data */ + ipt_account_tables[table_nr].data = new_data_page; ipt_account_tables[table_nr].itemcount = 0; return handle; } -/* Copy the actual that into a prepared buffer. +/* Copy 8 bit network data into a prepared buffer. We only copy entries != 0 to increase performance. - The memory gets freed again in ipt_account_handle_free(). */ -int ipt_account_handle_get_data(unsigned int handle, void *buffer) { +void ipt_account_handle_copy_data(void *to_user, int *pos, struct ipt_account_mask_24 *data, + unsigned int net_ip, unsigned int net_OR_mask) +{ struct ipt_account_handle_ip handle_ip; unsigned int handle_ip_size = sizeof (struct ipt_account_handle_ip); - unsigned int i, tmpbuf_pos=0; + + unsigned int i; + + for (i = 0; i <= 255; i++) { + if (data->ip[i].src_packets || data->ip[i].dst_packets) { + handle_ip.ip = net_ip | net_OR_mask | (i<<24); + + handle_ip.src_packets = data->ip[i].src_packets; + handle_ip.src_bytes = data->ip[i].src_bytes; + handle_ip.dst_packets = data->ip[i].dst_packets; + handle_ip.dst_bytes = data->ip[i].dst_bytes; + + /* Temporary buffer full? Flush to userspace */ + if (*pos+handle_ip_size >= PAGE_SIZE) { + copy_to_user(to_user, ipt_account_tmpbuf, *pos); + *pos = 0; + } + memcpy(ipt_account_tmpbuf+*pos, &handle_ip, handle_ip_size); + *pos += handle_ip_size; + } + } +} + +/* Copy the data from our internal structure + We only copy entries != 0 to increase performance. + Overwrites ipt_account_tmpbuf. +*/ +int ipt_account_handle_get_data(unsigned int handle, void *to_user) +{ + unsigned int tmpbuf_pos=0; if (handle >= ACCOUNT_MAX_HANDLES) { printk("ACCOUNT: invalid handle for ipt_account_handle_get_data() specified: %u\n", handle); @@ -615,69 +677,37 @@ int ipt_account_handle_get_data(unsigned int handle, void *buffer) { unsigned int net_ip = ipt_account_handles[handle].ip; unsigned int depth = ipt_account_handles[handle].depth; - // 8 bit network + /* 8 bit network */ if (depth == 0) { struct ipt_account_mask_24 *network = (struct ipt_account_mask_24*)ipt_account_handles[handle].data; - for (i = 0; i <= 255; i++) { - if (network->ip[i].src_packets || network->ip[i].dst_packets) { - handle_ip.ip = net_ip | (i<<24); - handle_ip.src_packets = network->ip[i].src_packets; - handle_ip.src_bytes = network->ip[i].src_bytes; - handle_ip.dst_packets = network->ip[i].dst_packets; - handle_ip.dst_bytes = network->ip[i].dst_bytes; - - // Temporary buffer full? Flush to userspace - if (tmpbuf_pos+handle_ip_size >= PAGE_SIZE) { - copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos); - tmpbuf_pos = 0; - } - memcpy(ipt_account_tmpbuf+tmpbuf_pos, &handle_ip, handle_ip_size); - tmpbuf_pos += handle_ip_size; - } - } - - // Flush remaining data to userspace + ipt_account_handle_copy_data(to_user, &tmpbuf_pos, network, net_ip, 0); + + /* Flush remaining data to userspace */ if (tmpbuf_pos) - copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos); + copy_to_user(to_user, ipt_account_tmpbuf, tmpbuf_pos); return 0; } - // 16 bit network + /* 16 bit network */ if (depth == 1) { struct ipt_account_mask_16 *network_16 = (struct ipt_account_mask_16*)ipt_account_handles[handle].data; unsigned int b; for (b = 0; b <= 255; b++) { if (network_16->mask_24[b]) { struct ipt_account_mask_24 *network = (struct ipt_account_mask_24*)network_16->mask_24[b]; - for (i = 0; i <= 255; i++) { - if (network->ip[i].src_packets || network->ip[i].dst_packets) { - handle_ip.ip = net_ip | (b << 16) | (i<<24); - handle_ip.src_packets = network->ip[i].src_packets; - handle_ip.src_bytes = network->ip[i].src_bytes; - handle_ip.dst_packets = network->ip[i].dst_packets; - handle_ip.dst_bytes = network->ip[i].dst_bytes; - - // Temporary buffer full? Flush to userspace - if (tmpbuf_pos+handle_ip_size >= PAGE_SIZE) { - copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos); - tmpbuf_pos = 0; - } - memcpy(ipt_account_tmpbuf+tmpbuf_pos, &handle_ip, handle_ip_size); - tmpbuf_pos += handle_ip_size; - } - } + ipt_account_handle_copy_data(to_user, &tmpbuf_pos, network, net_ip, (b << 16)); } } - // Flush remaining data to userspace + /* Flush remaining data to userspace */ if (tmpbuf_pos) - copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos); + copy_to_user(to_user, ipt_account_tmpbuf, tmpbuf_pos); return 0; } - // 24 bit network + /* 24 bit network */ if (depth == 2) { struct ipt_account_mask_8 *network_8 = (struct ipt_account_mask_8*)ipt_account_handles[handle].data; unsigned int a, b; @@ -687,39 +717,24 @@ int ipt_account_handle_get_data(unsigned int handle, void *buffer) { for (b = 0; b <= 255; b++) { if (network_16->mask_24[b]) { struct ipt_account_mask_24 *network = (struct ipt_account_mask_24*)network_16->mask_24[b]; - for (i = 0; i <= 255; i++) { - if (network->ip[i].src_packets || network->ip[i].dst_packets) { - handle_ip.ip = net_ip | (a << 8) | (b << 16) | (i<<24); - handle_ip.src_packets = network->ip[i].src_packets; - handle_ip.src_bytes = network->ip[i].src_bytes; - handle_ip.dst_packets = network->ip[i].dst_packets; - handle_ip.dst_bytes = network->ip[i].dst_bytes; - - // Temporary buffer full? Flush to userspace - if (tmpbuf_pos+handle_ip_size >= PAGE_SIZE) { - copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos); - tmpbuf_pos = 0; - } - memcpy(ipt_account_tmpbuf+tmpbuf_pos, &handle_ip, handle_ip_size); - tmpbuf_pos += handle_ip_size; - } - } + ipt_account_handle_copy_data(to_user, &tmpbuf_pos, network, net_ip, (a << 8) | (b << 16)); } } } } - // Flush remaining data to userspace + /* Flush remaining data to userspace */ if (tmpbuf_pos) - copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos); + copy_to_user(to_user, ipt_account_tmpbuf, tmpbuf_pos); return 0; } - + return -1; } -static int ipt_account_set_ctl(struct sock *sk, int cmd, void *user, unsigned int len) { +static int ipt_account_set_ctl(struct sock *sk, int cmd, void *user, unsigned int len) +{ struct ipt_account_handle_sockopt handle; int ret = -EINVAL; @@ -758,7 +773,8 @@ static int ipt_account_set_ctl(struct sock *sk, int cmd, void *user, unsigned in return ret; } -static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) { +static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) +{ struct ipt_account_handle_sockopt handle; int ret = -EINVAL; @@ -775,7 +791,7 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) { } if (copy_from_user (&handle, user, sizeof(struct ipt_account_handle_sockopt))) { - printk("ACCOUNT: ipt_account_get_ctl: copy_from_user failed for IPT_SO_GET_ACCOUNT_PREPARE_READ/READ_FLUSH\n"); + return -EFAULT; break; } @@ -789,12 +805,12 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) { spin_unlock_bh(&ipt_account_lock); if (handle.handle_nr == -1) { - printk("ACCOUNT: ipt_account_get_ctl: ipt_account_handle_prepare_read failed\n"); + return -EINVAL; break; } if (copy_to_user(user, &handle, sizeof(struct ipt_account_handle_sockopt))) { - printk("ACCOUNT: ipt_account_set_ctl: copy_to_user failed for IPT_SO_GET_ACCOUNT_PREPARE_READ/READ_FLUSH\n"); + return -EFAULT; break; } ret = 0; @@ -807,12 +823,12 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) { } if (copy_from_user (&handle, user, sizeof(struct ipt_account_handle_sockopt))) { - printk("ACCOUNT: ipt_account_get_ctl: copy_from_user failed for IPT_SO_GET_ACCOUNT_PREPARE_READ/READ_FLUSH\n"); + return -EFAULT; break; } if (handle.handle_nr >= ACCOUNT_MAX_HANDLES) { - printk("ACCOUNT: Invalid handle for IPT_SO_GET_ACCOUNT_GET_DATA: %u\n", handle.handle_nr); + return -EINVAL; break; } @@ -840,7 +856,7 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) { break; } - // Find out how many handles are in use + /* Find out how many handles are in use */ unsigned int i; handle.itemcount = 0; spin_lock_bh(&ipt_account_userspace_lock); @@ -850,7 +866,7 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) { spin_unlock_bh(&ipt_account_userspace_lock); if (copy_to_user(user, &handle, sizeof(struct ipt_account_handle_sockopt))) { - printk("ACCOUNT: ipt_account_set_ctl: copy_to_user failed for IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE\n"); + return -EFAULT; break; } ret = 0; @@ -859,13 +875,13 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) { case IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES: { spin_lock_bh(&ipt_account_lock); - // Determine size of table names + /* Determine size of table names */ unsigned int size = 0, i; for (i = 0; i < ACCOUNT_MAX_TABLES; i++) { if (ipt_account_tables[i].name[0] != 0) size += strlen (ipt_account_tables[i].name) + 1; } - size += 1; // Terminating NULL character + size += 1; /* Terminating NULL character */ if (*len < size) { spin_unlock_bh(&ipt_account_lock); @@ -873,16 +889,16 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) { ret = -ENOMEM; break; } - // Copy table names to userspace + /* Copy table names to userspace */ char *tnames = user; for (i = 0; i < ACCOUNT_MAX_TABLES; i++) { if (ipt_account_tables[i].name[0] != 0) { int len = strlen (ipt_account_tables[i].name) + 1; - copy_to_user(tnames, ipt_account_tables[i].name, len); // copy string + terminating zero + copy_to_user(tnames, ipt_account_tables[i].name, len); /* copy string + terminating zero */ tnames += len; } } - // Append terminating zero + /* Append terminating zero */ i = 0; copy_to_user(tnames, &i, 1); spin_unlock_bh(&ipt_account_lock); @@ -912,12 +928,8 @@ static struct nf_sockopt_ops ipt_account_sockopts IPT_SO_GET_ACCOUNT_PREPARE_READ, IPT_SO_GET_ACCOUNT_MAX+1, ipt_account_get_ctl, 0, NULL }; -static int __init init(void) { - if (PAGE_SIZE < 4096) { - printk("ACCOUNT: Sorry we need at least a PAGE_SIZE of 4096. Found: %lu\n", PAGE_SIZE); - return -EINVAL; - } - +static int __init init(void) +{ if ((ipt_account_tables = kmalloc(ACCOUNT_MAX_TABLES*sizeof(struct ipt_account_table), GFP_KERNEL)) == NULL) { printk("ACCOUNT: Out of memory allocating account_tables structure"); return -EINVAL; @@ -932,7 +944,7 @@ static int __init init(void) { } memset(ipt_account_handles, 0, ACCOUNT_MAX_HANDLES*sizeof(struct ipt_account_handle)); - // Allocate one page as temporary storage + /* Allocate one page as temporary storage */ if ((ipt_account_tmpbuf = (void*)__get_free_page(GFP_KERNEL)) == NULL) { printk("ACCOUNT: Out of memory for temporary buffer page\n"); kfree(ipt_account_tables); @@ -962,7 +974,8 @@ static int __init init(void) { return 0; } -static void __exit fini(void) { +static void __exit fini(void) +{ ipt_unregister_target(&ipt_account_reg); nf_unregister_sockopt(&ipt_account_sockopts);