* See http://www.intra2net.com/opensource/ipt_account *
* for further information *
* *
- * Copyright (C) 2004 by Intra2net AG *
+ * Copyright (C) 2004-2005 by Intra2net AG *
* opensource@intra2net.com *
* *
* This program is free software; you can redistribute it and/or modify *
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ip.h>
-#include <linux/spinlock.h>
#include <net/icmp.h>
#include <net/udp.h>
#include <net/tcp.h>
#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netfilter_ipv4/lockhelp.h>
+#include <asm/semaphore.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/string.h>
+#include <asm/uaccess.h>
-struct in_device;
#include <net/route.h>
#include <linux/netfilter_ipv4/ipt_ACCOUNT.h>
#error "ipt_ACCOUNT needs at least a PAGE_SIZE of 4096"
#endif
-struct ipt_acc_table *ipt_acc_tables = NULL;
-struct ipt_acc_handle *ipt_acc_handles = NULL;
-void *ipt_acc_tmpbuf = NULL;
+static struct ipt_acc_table *ipt_acc_tables = NULL;
+static struct ipt_acc_handle *ipt_acc_handles = NULL;
+static void *ipt_acc_tmpbuf = NULL;
/* Spinlock used for manipulating the current accounting tables/data */
-static spinlock_t ipt_acc_lock = SPIN_LOCK_UNLOCKED;
-/* Spinlock used for manipulating userspace handles/snapshot data */
-static spinlock_t ipt_acc_userspace_lock = SPIN_LOCK_UNLOCKED;
+DECLARE_LOCK(ipt_acc_lock);
+/* Mutex (semaphore) used for manipulating userspace handles/snapshot data */
+static struct semaphore ipt_acc_userspace_mutex;
/* Recursive free of all data structures */
-void ipt_acc_data_free(void *data, unsigned char depth)
+static void ipt_acc_data_free(void *data, unsigned char depth)
{
/* Empty data set */
if (!data)
/* Free for 8 bit network */
if (depth == 0) {
free_page((unsigned long)data);
- data = NULL;
return;
}
/* Free for 16 bit network */
if (depth == 1) {
struct ipt_acc_mask_16 *mask_16 = (struct ipt_acc_mask_16 *)data;
- unsigned int b;
+ u_int32_t b;
for (b=0; b <= 255; b++) {
if (mask_16->mask_24[b] != 0) {
free_page((unsigned long)mask_16->mask_24[b]);
- mask_16->mask_24[b] = NULL;
}
}
free_page((unsigned long)data);
- data = NULL;
return;
}
/* Free for 24 bit network */
if (depth == 2) {
- unsigned int a, b;
+ u_int32_t a, b;
for (a=0; a <= 255; a++) {
if (((struct ipt_acc_mask_8 *)data)->mask_16[a]) {
struct ipt_acc_mask_16 *mask_16 = (struct ipt_acc_mask_16*)
for (b=0; b <= 255; b++) {
if (mask_16->mask_24[b]) {
free_page((unsigned long)mask_16->mask_24[b]);
- mask_16->mask_24[b] = NULL;
}
}
free_page((unsigned long)mask_16);
- mask_16 = NULL;
}
}
free_page((unsigned long)data);
- data = NULL;
return;
}
/* Look for existing table / insert new one.
Return internal ID or -1 on error */
-int ipt_acc_table_insert(char *name, unsigned int ip, unsigned int netmask)
+static int ipt_acc_table_insert(char *name, u_int32_t ip, u_int32_t netmask)
{
- unsigned int i;
+ u_int32_t i;
DEBUGP("ACCOUNT: ipt_acc_table_insert: %s, %u.%u.%u.%u/%u.%u.%u.%u\n",
name, NIPQUAD(ip), NIPQUAD(netmask));
for (i = 0; i < ACCOUNT_MAX_TABLES; i++) {
/* Found free slot */
if (ipt_acc_tables[i].name[0] == 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);
ipt_acc_tables[i].ip = ip;
ipt_acc_tables[i].netmask = netmask;
/* Calculate netsize */
- unsigned int j, calc_mask, netsize=0;
calc_mask = htonl(netmask);
- for (j = 31; j > 0; j--) {
+ for (j = 31; j >= 0; j--) {
if (calc_mask&(1<<j))
netsize++;
else
unsigned int hook_mask)
{
struct ipt_acc_info *info = targinfo;
+ int table_nr;
if (targinfosize != IPT_ALIGN(sizeof(struct ipt_acc_info))) {
DEBUGP("ACCOUNT: targinfosize %u != %u\n",
return 0;
}
- spin_lock_bh(&ipt_acc_lock);
- int table_nr = ipt_acc_table_insert(info->table_name, info->net_ip,
- info->net_mask);
+ LOCK_BH(&ipt_acc_lock);
+ table_nr = ipt_acc_table_insert(info->table_name, info->net_ip,
+ info->net_mask);
+ UNLOCK_BH(&ipt_acc_lock);
+
if (table_nr == -1) {
printk("ACCOUNT: Table insert problem. Aborting\n");
- spin_unlock_bh(&ipt_acc_lock);
return 0;
}
/* 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_acc_lock);
-
return 1;
}
-void ipt_acc_deleteentry(void *targinfo, unsigned int targinfosize)
+static void ipt_acc_deleteentry(void *targinfo, unsigned int targinfosize)
{
- unsigned int i;
+ u_int32_t i;
struct ipt_acc_info *info = targinfo;
if (targinfosize != IPT_ALIGN(sizeof(struct ipt_acc_info))) {
targinfosize, IPT_ALIGN(sizeof(struct ipt_acc_info)));
}
- spin_lock_bh(&ipt_acc_lock);
+ LOCK_BH(&ipt_acc_lock);
DEBUGP("ACCOUNT: ipt_acc_deleteentry called for table: %s (#%d)\n",
info->table_name, info->table_nr);
sizeof(struct ipt_acc_table));
}
- spin_unlock_bh(&ipt_acc_lock);
+ UNLOCK_BH(&ipt_acc_lock);
return;
}
}
/* Table not found */
printk("ACCOUNT: Table %s not found for destroy\n", info->table_name);
- spin_unlock_bh(&ipt_acc_lock);
+ UNLOCK_BH(&ipt_acc_lock);
}
-void ipt_acc_depth0_insert(struct ipt_acc_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)
+static void ipt_acc_depth0_insert(struct ipt_acc_mask_24 *mask_24,
+ u_int32_t net_ip, u_int32_t netmask,
+ u_int32_t src_ip, u_int32_t dst_ip,
+ u_int32_t size, u_int32_t *itemcount)
{
- unsigned char is_src = 0, is_dst = 0;
+ unsigned char is_src = 0, is_dst = 0, src_slot, dst_slot;
+ char is_src_new_ip = 0, is_dst_new_ip = 0; /* Check if this entry is new */
DEBUGP("ACCOUNT: ipt_acc_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),
return;
}
- /* Check if this entry is new */
- char is_src_new_ip = 0, is_dst_new_ip = 0;
-
/* Calculate array positions */
- unsigned char src_slot = (unsigned char)((src_ip&0xFF000000) >> 24);
- unsigned char dst_slot = (unsigned char)((dst_ip&0xFF000000) >> 24);
+ src_slot = (unsigned char)((src_ip&0xFF000000) >> 24);
+ dst_slot = (unsigned char)((dst_ip&0xFF000000) >> 24);
/* Increase size counters */
if (is_src) {
DEBUGP("ACCOUNT: Itemcounter after: %d\n", *itemcount);
}
-void ipt_acc_depth1_insert(struct ipt_acc_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)
+static void ipt_acc_depth1_insert(struct ipt_acc_mask_16 *mask_16,
+ u_int32_t net_ip, u_int32_t netmask,
+ u_int32_t src_ip, u_int32_t dst_ip,
+ u_int32_t size, u_int32_t *itemcount)
{
/* Do we need to process src IP? */
if ((net_ip&netmask) == (src_ip&netmask)) {
}
}
-void ipt_acc_depth2_insert(struct ipt_acc_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)
+static void ipt_acc_depth2_insert(struct ipt_acc_mask_8 *mask_8,
+ u_int32_t net_ip, u_int32_t netmask,
+ u_int32_t src_ip, u_int32_t dst_ip,
+ u_int32_t size, u_int32_t *itemcount)
{
/* Do we need to process src IP? */
if ((net_ip&netmask) == (src_ip&netmask)) {
}
static unsigned int ipt_acc_target(struct sk_buff **pskb,
- unsigned int hooknum,
const struct net_device *in,
const struct net_device *out,
+ unsigned int hooknum,
const void *targinfo,
void *userinfo)
{
const struct ipt_acc_info *info =
(const struct ipt_acc_info *)targinfo;
- unsigned int src_ip = (*pskb)->nh.iph->saddr;
- unsigned int dst_ip = (*pskb)->nh.iph->daddr;
- unsigned int size = ntohs((*pskb)->nh.iph->tot_len);
+ u_int32_t src_ip = (*pskb)->nh.iph->saddr;
+ u_int32_t dst_ip = (*pskb)->nh.iph->daddr;
+ u_int32_t size = ntohs((*pskb)->nh.iph->tot_len);
- spin_lock_bh(&ipt_acc_lock);
+ LOCK_BH(&ipt_acc_lock);
if (ipt_acc_tables[info->table_nr].name[0] == 0) {
printk("ACCOUNT: ipt_acc_target: Invalid table id %u. "
"IPs %u.%u.%u.%u/%u.%u.%u.%u\n", info->table_nr,
NIPQUAD(src_ip), NIPQUAD(dst_ip));
- spin_unlock_bh(&ipt_acc_lock);
+ UNLOCK_BH(&ipt_acc_lock);
return IPT_CONTINUE;
}
ipt_acc_tables[info->table_nr].ip,
ipt_acc_tables[info->table_nr].netmask,
src_ip, dst_ip, size, &ipt_acc_tables[info->table_nr].itemcount);
- spin_unlock_bh(&ipt_acc_lock);
+ UNLOCK_BH(&ipt_acc_lock);
return IPT_CONTINUE;
}
ipt_acc_tables[info->table_nr].ip,
ipt_acc_tables[info->table_nr].netmask,
src_ip, dst_ip, size, &ipt_acc_tables[info->table_nr].itemcount);
- spin_unlock_bh(&ipt_acc_lock);
+ UNLOCK_BH(&ipt_acc_lock);
return IPT_CONTINUE;
}
ipt_acc_tables[info->table_nr].ip,
ipt_acc_tables[info->table_nr].netmask,
src_ip, dst_ip, size, &ipt_acc_tables[info->table_nr].itemcount);
- spin_unlock_bh(&ipt_acc_lock);
+ UNLOCK_BH(&ipt_acc_lock);
return IPT_CONTINUE;
}
"Table id %u. IPs %u.%u.%u.%u/%u.%u.%u.%u\n",
info->table_nr, NIPQUAD(src_ip), NIPQUAD(dst_ip));
- spin_unlock_bh(&ipt_acc_lock);
+ UNLOCK_BH(&ipt_acc_lock);
return IPT_CONTINUE;
}
but there could be two or more applications accessing the data
at the same time.
*/
-int ipt_acc_handle_find_slot(void)
+static int ipt_acc_handle_find_slot(void)
{
- unsigned int i;
+ u_int32_t i;
/* Insert new table */
for (i = 0; i < ACCOUNT_MAX_HANDLES; i++) {
/* Found free slot */
return -1;
}
-int ipt_acc_handle_free(unsigned int handle)
+static int ipt_acc_handle_free(u_int32_t handle)
{
if (handle >= ACCOUNT_MAX_HANDLES) {
printk("ACCOUNT: Invalid handle for ipt_acc_handle_free() specified:"
/* Prepare data for read without flush. Use only for debugging!
Real applications should use read&flush as it's way more efficent */
-int ipt_acc_handle_prepare_read(char *tablename, unsigned int *count)
+static int ipt_acc_handle_prepare_read(char *tablename,
+ struct ipt_acc_handle *dest, u_int32_t *count)
{
- int handle, i, table_nr=-1;
+ int table_nr=-1;
+ unsigned char depth;
- for (i = 0; i < ACCOUNT_MAX_TABLES; i++)
- if (strncmp(ipt_acc_tables[i].name, tablename,
- ACCOUNT_TABLE_NAME_LEN) == 0) {
- table_nr = i;
- break;
- }
+ for (table_nr = 0; table_nr < ACCOUNT_MAX_TABLES; table_nr++)
+ if (strncmp(ipt_acc_tables[table_nr].name, tablename,
+ ACCOUNT_TABLE_NAME_LEN) == 0)
+ break;
- if (table_nr == -1) {
+ if (table_nr == ACCOUNT_MAX_TABLES) {
printk("ACCOUNT: ipt_acc_handle_prepare_read(): "
"Table %s not found\n", tablename);
return -1;
}
- /* Can't find a free handle slot? */
- if ((handle = ipt_acc_handle_find_slot()) == -1)
- return -1;
-
/* Fill up handle structure */
- ipt_acc_handles[handle].ip = ipt_acc_tables[table_nr].ip;
- ipt_acc_handles[handle].depth = ipt_acc_tables[table_nr].depth;
- ipt_acc_handles[handle].itemcount = ipt_acc_tables[table_nr].itemcount;
+ dest->ip = ipt_acc_tables[table_nr].ip;
+ dest->depth = ipt_acc_tables[table_nr].depth;
+ dest->itemcount = ipt_acc_tables[table_nr].itemcount;
/* allocate "root" table */
- if ((ipt_acc_handles[handle].data =
- (void*)get_zeroed_page(GFP_ATOMIC)) == NULL) {
+ if ((dest->data = (void*)get_zeroed_page(GFP_ATOMIC)) == NULL) {
printk("ACCOUNT: out of memory for root table "
"in ipt_acc_handle_prepare_read()\n");
- memset (&ipt_acc_handles[handle], 0,
- sizeof(struct ipt_acc_handle));
return -1;
}
/* Recursive copy of complete data structure */
- unsigned int depth = ipt_acc_handles[handle].depth;
+ depth = dest->depth;
if (depth == 0) {
- memcpy(ipt_acc_handles[handle].data,
+ memcpy(dest->data,
ipt_acc_tables[table_nr].data,
sizeof(struct ipt_acc_mask_24));
} else if (depth == 1) {
struct ipt_acc_mask_16 *src_16 =
(struct ipt_acc_mask_16 *)ipt_acc_tables[table_nr].data;
struct ipt_acc_mask_16 *network_16 =
- (struct ipt_acc_mask_16 *)ipt_acc_handles[handle].data;
- unsigned int b;
+ (struct ipt_acc_mask_16 *)dest->data;
+ u_int32_t b;
for (b = 0; b <= 255; b++) {
if (src_16->mask_24[b]) {
(void*)get_zeroed_page(GFP_ATOMIC)) == NULL) {
printk("ACCOUNT: out of memory during copy of 16 bit "
"network in ipt_acc_handle_prepare_read()\n");
- ipt_acc_data_free(ipt_acc_handles[handle].data, depth);
- memset (&ipt_acc_handles[handle], 0,
- sizeof(struct ipt_acc_handle));
+ ipt_acc_data_free(dest->data, depth);
return -1;
}
struct ipt_acc_mask_8 *src_8 =
(struct ipt_acc_mask_8 *)ipt_acc_tables[table_nr].data;
struct ipt_acc_mask_8 *network_8 =
- (struct ipt_acc_mask_8 *)ipt_acc_handles[handle].data;
- unsigned int a;
+ (struct ipt_acc_mask_8 *)dest->data;
+ struct ipt_acc_mask_16 *src_16, *network_16;
+ u_int32_t a, b;
for (a = 0; a <= 255; a++) {
if (src_8->mask_16[a]) {
(void*)get_zeroed_page(GFP_ATOMIC)) == NULL) {
printk("ACCOUNT: out of memory during copy of 24 bit network"
" in ipt_acc_handle_prepare_read()\n");
- ipt_acc_data_free(ipt_acc_handles[handle].data, depth);
- memset (&ipt_acc_handles[handle], 0,
- sizeof(struct ipt_acc_handle));
+ ipt_acc_data_free(dest->data, depth);
return -1;
}
memcpy(network_8->mask_16[a], src_8->mask_16[a],
sizeof(struct ipt_acc_mask_16));
- struct ipt_acc_mask_16 *src_16 = src_8->mask_16[a];
- struct ipt_acc_mask_16 *network_16 = network_8->mask_16[a];
- unsigned int b;
+ src_16 = src_8->mask_16[a];
+ network_16 = network_8->mask_16[a];
for (b = 0; b <= 255; b++) {
if (src_16->mask_24[b]) {
(void*)get_zeroed_page(GFP_ATOMIC)) == NULL) {
printk("ACCOUNT: out of memory during copy of 16 bit"
" network in ipt_acc_handle_prepare_read()\n");
- ipt_acc_data_free(ipt_acc_handles[handle].data,
- depth);
- memset (&ipt_acc_handles[handle], 0,
- sizeof(struct ipt_acc_handle));
+ ipt_acc_data_free(dest->data, depth);
return -1;
}
}
*count = ipt_acc_tables[table_nr].itemcount;
- return handle;
+
+ return 0;
}
/* Prepare data for read and flush it */
-int ipt_acc_handle_prepare_read_flush(char *tablename, unsigned int *count)
+static int ipt_acc_handle_prepare_read_flush(char *tablename,
+ struct ipt_acc_handle *dest, u_int32_t *count)
{
- int handle, i, table_nr=-1;
+ int table_nr;
+ void *new_data_page;
- for (i = 0; i < ACCOUNT_MAX_TABLES; i++)
- if (strncmp(ipt_acc_tables[i].name, tablename,
- ACCOUNT_TABLE_NAME_LEN) == 0) {
- table_nr = i;
- break;
- }
+ for (table_nr = 0; table_nr < ACCOUNT_MAX_TABLES; table_nr++)
+ if (strncmp(ipt_acc_tables[table_nr].name, tablename,
+ ACCOUNT_TABLE_NAME_LEN) == 0)
+ break;
- if (table_nr == -1) {
+ if (table_nr == ACCOUNT_MAX_TABLES) {
printk("ACCOUNT: ipt_acc_handle_prepare_read_flush(): "
"Table %s not found\n", tablename);
return -1;
}
- /* Can't find a free handle slot? */
- if ((handle = ipt_acc_handle_find_slot()) == -1)
- return -1;
-
/* Try to allocate memory */
- void *new_data_page = (void*)get_zeroed_page(GFP_ATOMIC);
- if (!new_data_page)
- {
+ if (!(new_data_page = (void*)get_zeroed_page(GFP_ATOMIC))) {
printk("ACCOUNT: ipt_acc_handle_prepare_read_flush(): "
"Out of memory!\n");
return -1;
}
/* Fill up handle structure */
- ipt_acc_handles[handle].ip = ipt_acc_tables[table_nr].ip;
- ipt_acc_handles[handle].depth = ipt_acc_tables[table_nr].depth;
- ipt_acc_handles[handle].itemcount = ipt_acc_tables[table_nr].itemcount;
- ipt_acc_handles[handle].data = ipt_acc_tables[table_nr].data;
+ dest->ip = ipt_acc_tables[table_nr].ip;
+ dest->depth = ipt_acc_tables[table_nr].depth;
+ dest->itemcount = ipt_acc_tables[table_nr].itemcount;
+ dest->data = ipt_acc_tables[table_nr].data;
*count = ipt_acc_tables[table_nr].itemcount;
/* "Flush" table data */
ipt_acc_tables[table_nr].data = new_data_page;
ipt_acc_tables[table_nr].itemcount = 0;
- return handle;
+ return 0;
}
/* Copy 8 bit network data into a prepared buffer.
We only copy entries != 0 to increase performance.
*/
-void ipt_acc_handle_copy_data(void *to_user, int *pos,
+static int ipt_acc_handle_copy_data(void *to_user, u_int32_t *to_user_pos,
+ u_int32_t *tmpbuf_pos,
struct ipt_acc_mask_24 *data,
- unsigned int net_ip, unsigned int net_OR_mask)
+ u_int32_t net_ip, u_int32_t net_OR_mask)
{
struct ipt_acc_handle_ip handle_ip;
- unsigned int handle_ip_size = sizeof (struct ipt_acc_handle_ip);
-
- unsigned int i;
+ u_int32_t handle_ip_size = sizeof (struct ipt_acc_handle_ip);
+ u_int32_t i;
for (i = 0; i <= 255; i++) {
if (data->ip[i].src_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_acc_tmpbuf, *pos);
- *pos = 0;
+ if (*tmpbuf_pos+handle_ip_size >= PAGE_SIZE) {
+ if (copy_to_user(to_user + *to_user_pos, ipt_acc_tmpbuf,
+ *tmpbuf_pos))
+ return -EFAULT;
+ *to_user_pos = *to_user_pos + *tmpbuf_pos;
+ *tmpbuf_pos = 0;
}
- memcpy(ipt_acc_tmpbuf+*pos, &handle_ip, handle_ip_size);
- *pos += handle_ip_size;
+ memcpy(ipt_acc_tmpbuf+*tmpbuf_pos, &handle_ip, handle_ip_size);
+ *tmpbuf_pos += handle_ip_size;
}
}
+
+ return 0;
}
/* Copy the data from our internal structure
We only copy entries != 0 to increase performance.
Overwrites ipt_acc_tmpbuf.
*/
-int ipt_acc_handle_get_data(unsigned int handle, void *to_user)
+static int ipt_acc_handle_get_data(u_int32_t handle, void *to_user)
{
- unsigned int tmpbuf_pos=0;
+ u_int32_t to_user_pos=0, tmpbuf_pos=0, net_ip;
+ unsigned char depth;
if (handle >= ACCOUNT_MAX_HANDLES) {
printk("ACCOUNT: invalid handle for ipt_acc_handle_get_data() "
return -1;
}
- unsigned int net_ip = ipt_acc_handles[handle].ip;
- unsigned int depth = ipt_acc_handles[handle].depth;
+ net_ip = ipt_acc_handles[handle].ip;
+ depth = ipt_acc_handles[handle].depth;
/* 8 bit network */
if (depth == 0) {
struct ipt_acc_mask_24 *network =
(struct ipt_acc_mask_24*)ipt_acc_handles[handle].data;
- ipt_acc_handle_copy_data(to_user, &tmpbuf_pos, network, net_ip, 0);
+ if (ipt_acc_handle_copy_data(to_user, &to_user_pos, &tmpbuf_pos,
+ network, net_ip, 0))
+ return -1;
/* Flush remaining data to userspace */
if (tmpbuf_pos)
- copy_to_user(to_user, ipt_acc_tmpbuf, tmpbuf_pos);
+ if (copy_to_user(to_user+to_user_pos, ipt_acc_tmpbuf, tmpbuf_pos))
+ return -1;
return 0;
}
if (depth == 1) {
struct ipt_acc_mask_16 *network_16 =
(struct ipt_acc_mask_16*)ipt_acc_handles[handle].data;
- unsigned int b;
+ u_int32_t b;
for (b = 0; b <= 255; b++) {
if (network_16->mask_24[b]) {
struct ipt_acc_mask_24 *network =
(struct ipt_acc_mask_24*)network_16->mask_24[b];
- ipt_acc_handle_copy_data(to_user, &tmpbuf_pos, network,
- net_ip, (b << 16));
+ if (ipt_acc_handle_copy_data(to_user, &to_user_pos,
+ &tmpbuf_pos, network, net_ip, (b << 16)))
+ return -1;
}
}
/* Flush remaining data to userspace */
if (tmpbuf_pos)
- copy_to_user(to_user, ipt_acc_tmpbuf, tmpbuf_pos);
+ if (copy_to_user(to_user+to_user_pos, ipt_acc_tmpbuf, tmpbuf_pos))
+ return -1;
return 0;
}
if (depth == 2) {
struct ipt_acc_mask_8 *network_8 =
(struct ipt_acc_mask_8*)ipt_acc_handles[handle].data;
- unsigned int a, b;
+ u_int32_t a, b;
for (a = 0; a <= 255; a++) {
if (network_8->mask_16[a]) {
struct ipt_acc_mask_16 *network_16 =
if (network_16->mask_24[b]) {
struct ipt_acc_mask_24 *network =
(struct ipt_acc_mask_24*)network_16->mask_24[b];
- ipt_acc_handle_copy_data(to_user, &tmpbuf_pos, network,
- net_ip, (a << 8) | (b << 16));
+ if (ipt_acc_handle_copy_data(to_user,
+ &to_user_pos, &tmpbuf_pos,
+ network, net_ip, (a << 8) | (b << 16)))
+ return -1;
}
}
}
/* Flush remaining data to userspace */
if (tmpbuf_pos)
- copy_to_user(to_user, ipt_acc_tmpbuf, tmpbuf_pos);
+ if (copy_to_user(to_user+to_user_pos, ipt_acc_tmpbuf, tmpbuf_pos))
+ return -1;
return 0;
}
}
static int ipt_acc_set_ctl(struct sock *sk, int cmd,
- void *user, unsigned int len)
+ void *user, u_int32_t len)
{
struct ipt_acc_handle_sockopt handle;
int ret = -EINVAL;
break;
}
- spin_lock_bh(&ipt_acc_userspace_lock);
+ down(&ipt_acc_userspace_mutex);
ret = ipt_acc_handle_free(handle.handle_nr);
- spin_unlock_bh(&ipt_acc_userspace_lock);
+ up(&ipt_acc_userspace_mutex);
break;
case IPT_SO_SET_ACCOUNT_HANDLE_FREE_ALL: {
- unsigned int i;
- spin_lock_bh(&ipt_acc_userspace_lock);
+ u_int32_t i;
+ down(&ipt_acc_userspace_mutex);
for (i = 0; i < ACCOUNT_MAX_HANDLES; i++)
ipt_acc_handle_free(i);
- spin_unlock_bh(&ipt_acc_userspace_lock);
+ up(&ipt_acc_userspace_mutex);
ret = 0;
break;
}
switch (cmd) {
case IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH:
- case IPT_SO_GET_ACCOUNT_PREPARE_READ:
- if (*len < sizeof(struct ipt_acc_handle_sockopt)) {
- printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %u) "
- "for IPT_SO_GET_ACCOUNT_PREPARE_READ/READ_FLUSH\n",
- *len, sizeof(struct ipt_acc_handle_sockopt));
- break;
- }
-
- if (copy_from_user (&handle, user,
+ case IPT_SO_GET_ACCOUNT_PREPARE_READ: {
+ struct ipt_acc_handle dest;
+
+ if (*len < sizeof(struct ipt_acc_handle_sockopt)) {
+ printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %u) "
+ "for IPT_SO_GET_ACCOUNT_PREPARE_READ/READ_FLUSH\n",
+ *len, sizeof(struct ipt_acc_handle_sockopt));
+ break;
+ }
+
+ if (copy_from_user (&handle, user,
+ sizeof(struct ipt_acc_handle_sockopt))) {
+ return -EFAULT;
+ break;
+ }
+
+ LOCK_BH(&ipt_acc_lock);
+ if (cmd == IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH)
+ ret = ipt_acc_handle_prepare_read_flush(
+ handle.name, &dest, &handle.itemcount);
+ else
+ ret = ipt_acc_handle_prepare_read(
+ handle.name, &dest, &handle.itemcount);
+ UNLOCK_BH(&ipt_acc_lock);
+ // Error occured during prepare_read?
+ if (ret == -1)
+ return -EINVAL;
+
+ /* Allocate a userspace handle */
+ 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,
+ sizeof(struct ipt_acc_handle));
+ up(&ipt_acc_userspace_mutex);
+
+ if (copy_to_user(user, &handle,
sizeof(struct ipt_acc_handle_sockopt))) {
- return -EFAULT;
- break;
- }
-
- spin_lock_bh(&ipt_acc_lock);
- spin_lock_bh(&ipt_acc_userspace_lock);
- if (cmd == IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH)
- handle.handle_nr = ipt_acc_handle_prepare_read_flush(
- handle.name, &handle.itemcount);
- else
- handle.handle_nr = ipt_acc_handle_prepare_read(
- handle.name, &handle.itemcount);
- spin_unlock_bh(&ipt_acc_userspace_lock);
- spin_unlock_bh(&ipt_acc_lock);
-
- if (handle.handle_nr == -1) {
- return -EINVAL;
- break;
- }
-
- if (copy_to_user(user, &handle,
- sizeof(struct ipt_acc_handle_sockopt))) {
- return -EFAULT;
+ return -EFAULT;
+ break;
+ }
+ ret = 0;
break;
}
- ret = 0;
- break;
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)"
break;
}
- spin_lock_bh(&ipt_acc_userspace_lock);
+ down(&ipt_acc_userspace_mutex);
ret = ipt_acc_handle_get_data(handle.handle_nr, user);
- spin_unlock_bh(&ipt_acc_userspace_lock);
+ up(&ipt_acc_userspace_mutex);
if (ret) {
printk("ACCOUNT: ipt_acc_get_ctl: ipt_acc_handle_get_data"
" failed for handle %u\n", handle.handle_nr);
ret = 0;
break;
case IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE: {
+ u_int32_t i;
if (*len < sizeof(struct ipt_acc_handle_sockopt)) {
printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %u)"
" for IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE\n",
}
/* Find out how many handles are in use */
- unsigned int i;
handle.itemcount = 0;
- spin_lock_bh(&ipt_acc_userspace_lock);
+ down(&ipt_acc_userspace_mutex);
for (i = 0; i < ACCOUNT_MAX_HANDLES; i++)
if (ipt_acc_handles[i].data)
handle.itemcount++;
- spin_unlock_bh(&ipt_acc_userspace_lock);
+ up(&ipt_acc_userspace_mutex);
if (copy_to_user(user, &handle,
sizeof(struct ipt_acc_handle_sockopt))) {
break;
}
case IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES: {
- spin_lock_bh(&ipt_acc_lock);
+ u_int32_t size = 0, i, name_len;
+ char *tnames;
+
+ LOCK_BH(&ipt_acc_lock);
/* Determine size of table names */
- unsigned int size = 0, i;
for (i = 0; i < ACCOUNT_MAX_TABLES; i++) {
if (ipt_acc_tables[i].name[0] != 0)
size += strlen (ipt_acc_tables[i].name) + 1;
}
size += 1; /* Terminating NULL character */
- if (*len < size) {
- spin_unlock_bh(&ipt_acc_lock);
- printk("ACCOUNT: ipt_acc_get_ctl: not enough space (%u < %u)"
- " to store table names\n", *len, size);
+ if (*len < size || size > PAGE_SIZE) {
+ UNLOCK_BH(&ipt_acc_lock);
+ printk("ACCOUNT: ipt_acc_get_ctl: not enough space (%u < %u < %lu)"
+ " to store table names\n", *len, size, PAGE_SIZE);
ret = -ENOMEM;
break;
}
/* Copy table names to userspace */
- char *tnames = user;
+ tnames = ipt_acc_tmpbuf;
for (i = 0; i < ACCOUNT_MAX_TABLES; i++) {
if (ipt_acc_tables[i].name[0] != 0) {
- int len = strlen (ipt_acc_tables[i].name) + 1;
- /* copy string + terminating zero */
- copy_to_user(tnames, ipt_acc_tables[i].name, len);
- tnames += len;
+ name_len = strlen (ipt_acc_tables[i].name) + 1;
+ memcpy(tnames, ipt_acc_tables[i].name, name_len);
+ tnames += name_len;
}
}
- /* Append terminating zero */
- i = 0;
- copy_to_user(tnames, &i, 1);
- spin_unlock_bh(&ipt_acc_lock);
+ UNLOCK_BH(&ipt_acc_lock);
+
+ /* Terminating NULL character */
+ *tnames = 0;
+
+ /* Transfer to userspace */
+ if (copy_to_user(user, ipt_acc_tmpbuf, size))
+ return -EFAULT;
+
ret = 0;
break;
}
}
static struct ipt_target ipt_acc_reg = {
- {
- NULL, NULL
- },
- "ACCOUNT",
- ipt_acc_target,
- ipt_acc_checkentry,
- ipt_acc_deleteentry,
- THIS_MODULE
+ .name = "ACCOUNT",
+ .target = ipt_acc_target,
+ .checkentry = ipt_acc_checkentry,
+ .destroy = ipt_acc_deleteentry,
+ .me = THIS_MODULE
};
static struct nf_sockopt_ops ipt_acc_sockopts = {
- {
- NULL, NULL
- },
- PF_INET,
- IPT_SO_SET_ACCOUNT_HANDLE_FREE,
- IPT_SO_SET_ACCOUNT_MAX+1,
- ipt_acc_set_ctl,
- IPT_SO_GET_ACCOUNT_PREPARE_READ,
- IPT_SO_GET_ACCOUNT_MAX+1,
- ipt_acc_get_ctl,
- 0,
- NULL
+ .pf = PF_INET,
+ .set_optmin = IPT_SO_SET_ACCOUNT_HANDLE_FREE,
+ .set_optmax = IPT_SO_SET_ACCOUNT_MAX+1,
+ .set = ipt_acc_set_ctl,
+ .get_optmin = IPT_SO_GET_ACCOUNT_PREPARE_READ,
+ .get_optmax = IPT_SO_GET_ACCOUNT_MAX+1,
+ .get = ipt_acc_get_ctl
};
static int __init init(void)
{
+ init_MUTEX(&ipt_acc_userspace_mutex);
+
if ((ipt_acc_tables =
kmalloc(ACCOUNT_MAX_TABLES *
sizeof(struct ipt_acc_table), GFP_KERNEL)) == NULL) {
printk("ACCOUNT: Out of memory allocating account_tables structure");
- return -EINVAL;
+ goto error_cleanup;
}
memset(ipt_acc_tables, 0,
ACCOUNT_MAX_TABLES * sizeof(struct ipt_acc_table));
kmalloc(ACCOUNT_MAX_HANDLES *
sizeof(struct ipt_acc_handle), GFP_KERNEL)) == NULL) {
printk("ACCOUNT: Out of memory allocating account_handles structure");
- kfree (ipt_acc_tables);
- ipt_acc_tables = NULL;
- return -EINVAL;
+ goto error_cleanup;
}
memset(ipt_acc_handles, 0,
ACCOUNT_MAX_HANDLES * sizeof(struct ipt_acc_handle));
/* Allocate one page as temporary storage */
if ((ipt_acc_tmpbuf = (void*)__get_free_page(GFP_KERNEL)) == NULL) {
printk("ACCOUNT: Out of memory for temporary buffer page\n");
- kfree(ipt_acc_tables);
- kfree(ipt_acc_handles);
- ipt_acc_tables = NULL;
- ipt_acc_handles = NULL;
- return -EINVAL;
+ goto error_cleanup;
}
/* Register setsockopt */
if (nf_register_sockopt(&ipt_acc_sockopts) < 0) {
printk("ACCOUNT: Can't register sockopts. Aborting\n");
-
- kfree(ipt_acc_tables);
- kfree(ipt_acc_handles);
- free_page((unsigned long)ipt_acc_tmpbuf);
- ipt_acc_tables = NULL;
- ipt_acc_handles = NULL;
- ipt_acc_tmpbuf = NULL;
-
- return -EINVAL;
+ goto error_cleanup;
}
if (ipt_register_target(&ipt_acc_reg))
- return -EINVAL;
-
+ goto error_cleanup;
+
return 0;
+
+error_cleanup:
+ if(ipt_acc_tables)
+ kfree(ipt_acc_tables);
+ if(ipt_acc_handles)
+ kfree(ipt_acc_handles);
+ if (ipt_acc_tmpbuf)
+ free_page((unsigned long)ipt_acc_tmpbuf);
+
+ return -EINVAL;
}
static void __exit fini(void)
kfree(ipt_acc_tables);
kfree(ipt_acc_handles);
free_page((unsigned long)ipt_acc_tmpbuf);
-
- ipt_acc_tables = NULL;
- ipt_acc_handles = NULL;
- ipt_acc_tmpbuf = NULL;
}
module_init(init);
git://developer.intra2net.com / ipt_ACCOUNT / blobdiff