X-Git-Url: http://developer.intra2net.com/git/?p=ipt_ACCOUNT;a=blobdiff_plain;f=linux%2Fnet%2Fipv4%2Fnetfilter%2Fipt_ACCOUNT.c;h=a64167001fd34020689c1f65bfc08413abcc66a1;hp=c1d89fc13ccaa59785c52cbc2280a1064edc570f;hb=8bea9bf9644c8c38cc956c667b4026ab8b9b80d0;hpb=07eb98b4d52698eb30dc2a5fe7792b5ab6623ee1 diff --git a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c index c1d89fc..a641670 100644 --- a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c +++ b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c @@ -3,7 +3,7 @@ * 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 * @@ -15,17 +15,17 @@ #include #include #include -#include #include #include #include #include +#include +#include #include #include #include #include -struct in_device; #include #include @@ -39,18 +39,18 @@ struct in_device; #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) @@ -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,7 +137,8 @@ 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; + u_int32_t calc_mask, netsize=0; + int j; /* needs to be unsigned, 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); @@ -200,24 +201,23 @@ static int ipt_acc_checkentry(const char *tablename, return 0; } - spin_lock_bh(&ipt_acc_lock); + 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) { u_int32_t i; struct ipt_acc_info *info = targinfo; @@ -227,7 +227,7 @@ void ipt_acc_deleteentry(void *targinfo, unsigned int targinfosize) 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); @@ -253,17 +253,17 @@ void ipt_acc_deleteentry(void *targinfo, unsigned int targinfosize) 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, +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) @@ -337,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) @@ -375,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) @@ -426,13 +426,13 @@ static unsigned int ipt_acc_target(struct sk_buff **pskb, 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; } @@ -444,7 +444,7 @@ static unsigned int ipt_acc_target(struct sk_buff **pskb, 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; } @@ -455,7 +455,7 @@ static unsigned int ipt_acc_target(struct sk_buff **pskb, 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; } @@ -466,7 +466,7 @@ static unsigned int ipt_acc_target(struct sk_buff **pskb, 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; } @@ -474,7 +474,7 @@ static unsigned int ipt_acc_target(struct sk_buff **pskb, "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; } @@ -495,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 */ @@ -515,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:" @@ -531,54 +531,46 @@ 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, + 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 */ - 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; + (struct ipt_acc_mask_16 *)dest->data; u_int32_t b; for (b = 0; b <= 255; b++) { @@ -587,9 +579,7 @@ int ipt_acc_handle_prepare_read(char *tablename, u_int32_t *count) (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; } @@ -601,7 +591,7 @@ int ipt_acc_handle_prepare_read(char *tablename, u_int32_t *count) 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; + (struct ipt_acc_mask_8 *)dest->data; u_int32_t a; for (a = 0; a <= 255; a++) { @@ -610,9 +600,7 @@ int ipt_acc_handle_prepare_read(char *tablename, u_int32_t *count) (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; } @@ -629,10 +617,7 @@ int ipt_acc_handle_prepare_read(char *tablename, u_int32_t *count) (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; } @@ -645,32 +630,28 @@ int ipt_acc_handle_prepare_read(char *tablename, u_int32_t *count) } *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, u_int32_t *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 */ if (!(new_data_page = (void*)get_zeroed_page(GFP_ATOMIC))) { printk("ACCOUNT: ipt_acc_handle_prepare_read_flush(): " @@ -679,23 +660,24 @@ int ipt_acc_handle_prepare_read_flush(char *tablename, u_int32_t *count) } /* 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, u_int32_t net_ip, u_int32_t net_OR_mask) { @@ -713,24 +695,28 @@ 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, net_ip; + u_int32_t to_user_pos=0, tmpbuf_pos=0, net_ip; unsigned char depth; if (handle >= ACCOUNT_MAX_HANDLES) { @@ -751,11 +737,13 @@ int ipt_acc_handle_get_data(u_int32_t handle, void *to_user) 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; @@ -770,14 +758,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, + &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; @@ -796,8 +785,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, &tmpbuf_pos, + network, net_ip, (a << 8) | (b << 16))) + return -1; } } } @@ -805,7 +796,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; @@ -838,16 +829,16 @@ static int ipt_acc_set_ctl(struct sock *sk, int cmd, 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: { u_int32_t i; - spin_lock_bh(&ipt_acc_userspace_lock); + 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; } @@ -868,43 +859,53 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) 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)" @@ -934,9 +935,9 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) 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); @@ -956,11 +957,11 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) /* Find out how many handles are in use */ 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))) { @@ -971,10 +972,10 @@ 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; + u_int32_t size = 0, i, name_len; char *tnames; - - spin_lock_bh(&ipt_acc_lock); + + LOCK_BH(&ipt_acc_lock); /* Determine size of table names */ for (i = 0; i < ACCOUNT_MAX_TABLES; i++) { @@ -983,32 +984,31 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) } 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 */ - 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 */ - if (copy_to_user(tnames, ipt_acc_tables[i].name, len)) { - spin_unlock_bh(&ipt_acc_lock); - return -EFAULT; - } - 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; - ret = copy_to_user(tnames, &i, 1); - spin_unlock_bh(&ipt_acc_lock); - if (ret) + 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; } @@ -1039,6 +1039,8 @@ static struct nf_sockopt_ops ipt_acc_sockopts = { 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) {