X-Git-Url: http://developer.intra2net.com/git/?p=ipt_ACCOUNT;a=blobdiff_plain;f=linux%2Fnet%2Fipv4%2Fnetfilter%2Fipt_ACCOUNT.c;h=79cfe3d4b31515cb3a679d86a5937c91ed45b129;hp=c4cdb59af93de85ad4323e59fd47250dc236a1cb;hb=32cd84a6845e532242f64a39a0285ad31928df26;hpb=6fe5ced99341435985727459f26d3afe3ab8026e diff --git a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c index c4cdb59..79cfe3d 100644 --- a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c +++ b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c @@ -50,7 +50,7 @@ static spinlock_t ipt_acc_userspace_lock = SPIN_LOCK_UNLOCKED; /* 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) @@ -102,7 +102,7 @@ void ipt_acc_data_free(void *data, unsigned char depth) /* Look for existing table / insert new one. Return internal ID or -1 on error */ -int ipt_acc_table_insert(char *name, u_int32_t ip, u_int32_t netmask) +static int ipt_acc_table_insert(char *name, u_int32_t ip, u_int32_t netmask) { u_int32_t i; @@ -137,15 +137,15 @@ int ipt_acc_table_insert(char *name, u_int32_t ip, u_int32_t netmask) 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; + 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 */ - u_int32_t j, calc_mask, netsize=0; calc_mask = htonl(netmask); for (j = 31; j >= 0; j--) { if (calc_mask&(1<table_name, info->net_ip, - info->net_mask); + table_nr = ipt_acc_table_insert(info->table_name, info->net_ip, + info->net_mask); if (table_nr == -1) { printk("ACCOUNT: Table insert problem. Aborting\n"); spin_unlock_bh(&ipt_acc_lock); @@ -216,7 +217,7 @@ static int ipt_acc_checkentry(const char *tablename, return 1; } -void ipt_acc_deleteentry(void *targinfo, unsigned int targinfosize) +static void ipt_acc_deleteentry(void *targinfo, unsigned int targinfosize) { u_int32_t i; struct ipt_acc_info *info = targinfo; @@ -262,12 +263,13 @@ void ipt_acc_deleteentry(void *targinfo, unsigned int targinfosize) spin_unlock_bh(&ipt_acc_lock); } -void ipt_acc_depth0_insert(struct ipt_acc_mask_24 *mask_24, +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), @@ -289,12 +291,9 @@ void ipt_acc_depth0_insert(struct ipt_acc_mask_24 *mask_24, 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) { @@ -338,7 +337,7 @@ void ipt_acc_depth0_insert(struct ipt_acc_mask_24 *mask_24, DEBUGP("ACCOUNT: Itemcounter after: %d\n", *itemcount); } -void ipt_acc_depth1_insert(struct ipt_acc_mask_16 *mask_16, +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) @@ -376,7 +375,7 @@ void ipt_acc_depth1_insert(struct ipt_acc_mask_16 *mask_16, } } -void ipt_acc_depth2_insert(struct ipt_acc_mask_8 *mask_8, +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) @@ -496,7 +495,7 @@ static unsigned int ipt_acc_target(struct sk_buff **pskb, 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) { u_int32_t i; /* Insert new table */ @@ -516,7 +515,7 @@ int ipt_acc_handle_find_slot(void) return -1; } -int ipt_acc_handle_free(u_int32_t 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:" @@ -532,9 +531,10 @@ int ipt_acc_handle_free(u_int32_t 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_acc_handle_prepare_read(char *tablename, u_int32_t *count) +static int ipt_acc_handle_prepare_read(char *tablename, u_int32_t *count) { int handle, i, table_nr=-1; + unsigned char depth; for (i = 0; i < ACCOUNT_MAX_TABLES; i++) if (strncmp(ipt_acc_tables[i].name, tablename, @@ -569,7 +569,7 @@ int ipt_acc_handle_prepare_read(char *tablename, u_int32_t *count) } /* Recursive copy of complete data structure */ - u_int32_t depth = ipt_acc_handles[handle].depth; + depth = ipt_acc_handles[handle].depth; if (depth == 0) { memcpy(ipt_acc_handles[handle].data, ipt_acc_tables[table_nr].data, @@ -649,9 +649,10 @@ int ipt_acc_handle_prepare_read(char *tablename, u_int32_t *count) } /* Prepare data for read and flush it */ -int ipt_acc_handle_prepare_read_flush(char *tablename, u_int32_t *count) +static int ipt_acc_handle_prepare_read_flush(char *tablename, u_int32_t *count) { int handle, i, table_nr=-1; + void *new_data_page; for (i = 0; i < ACCOUNT_MAX_TABLES; i++) if (strncmp(ipt_acc_tables[i].name, tablename, @@ -671,9 +672,7 @@ int ipt_acc_handle_prepare_read_flush(char *tablename, u_int32_t *count) 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; @@ -696,13 +695,13 @@ int ipt_acc_handle_prepare_read_flush(char *tablename, u_int32_t *count) /* 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, u_int32_t net_ip, u_int32_t net_OR_mask) { struct ipt_acc_handle_ip handle_ip; u_int32_t handle_ip_size = sizeof (struct ipt_acc_handle_ip); - u_int32_t i; for (i = 0; i <= 255; i++) { @@ -715,24 +714,29 @@ void ipt_acc_handle_copy_data(void *to_user, int *pos, handle_ip.dst_bytes = data->ip[i].dst_bytes; /* Temporary buffer full? Flush to userspace */ - if (*pos+handle_ip_size >= PAGE_SIZE) { - *pos = 0; - if (copy_to_user(to_user, ipt_acc_tmpbuf, *pos)) - return; + 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(u_int32_t handle, void *to_user) +static int ipt_acc_handle_get_data(u_int32_t handle, void *to_user) { - u_int32_t 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() " @@ -745,18 +749,20 @@ int ipt_acc_handle_get_data(u_int32_t handle, void *to_user) return -1; } - u_int32_t net_ip = ipt_acc_handles[handle].ip; - u_int32_t 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) - if (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; @@ -771,14 +777,15 @@ int ipt_acc_handle_get_data(u_int32_t handle, void *to_user) 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, &to_user_pos, + &tmpbuf_pos, network, net_ip, (b << 16))) + return -1; } } /* Flush remaining data to userspace */ if (tmpbuf_pos) - if (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; @@ -797,8 +804,10 @@ int ipt_acc_handle_get_data(u_int32_t handle, void *to_user) 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, + &to_user_pos, &tmpbuf_pos, + network, net_ip, (a << 8) | (b << 16))) + return -1; } } } @@ -806,7 +815,7 @@ int ipt_acc_handle_get_data(u_int32_t handle, void *to_user) /* Flush remaining data to userspace */ if (tmpbuf_pos) - if (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; @@ -947,6 +956,7 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) 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", @@ -955,7 +965,6 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) } /* Find out how many handles are in use */ - u_int32_t i; handle.itemcount = 0; spin_lock_bh(&ipt_acc_userspace_lock); for (i = 0; i < ACCOUNT_MAX_HANDLES; i++) @@ -972,10 +981,12 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) break; } case IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES: { + u_int32_t size = 0, i; + char *tnames; + spin_lock_bh(&ipt_acc_lock); /* Determine size of table names */ - u_int32_t 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; @@ -990,7 +1001,7 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) break; } /* Copy table names to userspace */ - char *tnames = user; + tnames = user; 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;