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=0e4f612f1264053deb3e277e0eb73e411d16fb6d;hb=32cd84a6845e532242f64a39a0285ad31928df26;hpb=6803acfc83b4fcb55bd9836cc6c4208b5c6fa504 diff --git a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c index 0e4f612..79cfe3d 100644 --- a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c +++ b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c @@ -20,6 +20,10 @@ #include #include #include +#include +#include +#include +#include struct in_device; #include @@ -46,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) @@ -55,28 +59,25 @@ void ipt_acc_data_free(void *data, unsigned char depth) /* 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*) @@ -85,15 +86,12 @@ void ipt_acc_data_free(void *data, unsigned char depth) 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; } @@ -104,9 +102,9 @@ 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, 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)); @@ -139,17 +137,17 @@ int ipt_acc_table_insert(char *name, unsigned int ip, unsigned int 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 */ - 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<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); @@ -218,9 +217,9 @@ 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) { - unsigned int i; + u_int32_t i; struct ipt_acc_info *info = targinfo; if (targinfosize != IPT_ALIGN(sizeof(struct ipt_acc_info))) { @@ -264,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, - 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), @@ -291,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) { @@ -340,10 +337,10 @@ 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, - 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)) { @@ -378,10 +375,10 @@ void ipt_acc_depth1_insert(struct ipt_acc_mask_16 *mask_16, } } -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)) { @@ -425,9 +422,9 @@ static unsigned int ipt_acc_target(struct sk_buff **pskb, { 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); @@ -498,9 +495,9 @@ 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) { - unsigned int i; + u_int32_t i; /* Insert new table */ for (i = 0; i < ACCOUNT_MAX_HANDLES; i++) { /* Found free slot */ @@ -518,7 +515,7 @@ int ipt_acc_handle_find_slot(void) 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:" @@ -534,9 +531,10 @@ int ipt_acc_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_acc_handle_prepare_read(char *tablename, unsigned int *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, @@ -571,7 +569,7 @@ int ipt_acc_handle_prepare_read(char *tablename, unsigned int *count) } /* Recursive copy of complete data structure */ - unsigned int 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, @@ -581,7 +579,7 @@ int ipt_acc_handle_prepare_read(char *tablename, unsigned int *count) (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; + u_int32_t b; for (b = 0; b <= 255; b++) { if (src_16->mask_24[b]) { @@ -604,7 +602,7 @@ int ipt_acc_handle_prepare_read(char *tablename, unsigned int *count) (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; + u_int32_t a; for (a = 0; a <= 255; a++) { if (src_8->mask_16[a]) { @@ -623,7 +621,7 @@ int ipt_acc_handle_prepare_read(char *tablename, unsigned int *count) 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; + u_int32_t b; for (b = 0; b <= 255; b++) { if (src_16->mask_24[b]) { @@ -651,9 +649,10 @@ int ipt_acc_handle_prepare_read(char *tablename, unsigned int *count) } /* 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, 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, @@ -673,9 +672,7 @@ int ipt_acc_handle_prepare_read_flush(char *tablename, unsigned int *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; @@ -698,14 +695,14 @@ int ipt_acc_handle_prepare_read_flush(char *tablename, unsigned int *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, - 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) { @@ -717,23 +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) { - 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() " @@ -746,18 +749,21 @@ int ipt_acc_handle_get_data(unsigned int handle, void *to_user) 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; } @@ -766,19 +772,21 @@ int ipt_acc_handle_get_data(unsigned int handle, void *to_user) 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, &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; } @@ -787,7 +795,7 @@ int ipt_acc_handle_get_data(unsigned int handle, void *to_user) 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 = @@ -796,8 +804,10 @@ int ipt_acc_handle_get_data(unsigned int 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; } } } @@ -805,7 +815,8 @@ int ipt_acc_handle_get_data(unsigned int handle, void *to_user) /* 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; } @@ -814,7 +825,7 @@ int ipt_acc_handle_get_data(unsigned int handle, void *to_user) } 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; @@ -842,7 +853,7 @@ static int ipt_acc_set_ctl(struct sock *sk, int cmd, spin_unlock_bh(&ipt_acc_userspace_lock); break; case IPT_SO_SET_ACCOUNT_HANDLE_FREE_ALL: { - unsigned int i; + u_int32_t i; spin_lock_bh(&ipt_acc_userspace_lock); for (i = 0; i < ACCOUNT_MAX_HANDLES; i++) ipt_acc_handle_free(i); @@ -945,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", @@ -953,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 */ - unsigned int i; handle.itemcount = 0; spin_lock_bh(&ipt_acc_userspace_lock); for (i = 0; i < ACCOUNT_MAX_HANDLES; i++) @@ -970,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 */ - 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; @@ -988,19 +1001,24 @@ 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; /* copy string + terminating zero */ - copy_to_user(tnames, ipt_acc_tables[i].name, len); + if (copy_to_user(tnames, ipt_acc_tables[i].name, len)) { + spin_unlock_bh(&ipt_acc_lock); + return -EFAULT; + } tnames += len; } } /* Append terminating zero */ i = 0; - copy_to_user(tnames, &i, 1); + ret = copy_to_user(tnames, &i, 1); spin_unlock_bh(&ipt_acc_lock); + if (ret) + return -EFAULT; ret = 0; break; } @@ -1012,29 +1030,21 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) } 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) @@ -1043,7 +1053,7 @@ static int __init init(void) 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)); @@ -1052,9 +1062,7 @@ static int __init init(void) 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)); @@ -1062,31 +1070,29 @@ static int __init init(void) /* 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) @@ -1098,10 +1104,6 @@ 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);