anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-19 11:04:56 +02:00
Code Issues Releases Wiki Activity

pknock: split long instructions, esp. allocations in if()

Browse Source
This commit is contained in:
Jan Engelhardt
2009-09-30 01:16:08 +02:00
parent d116000784
commit 79d54ebd7c
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
extensions/xt_pknock.c
View File

@@ -124,7 +124,8 @@ alloc_hashtable(unsigned int size)
struct list_head *hash; struct list_head *hash;
unsigned int i; unsigned int i;
if ((hash = kmalloc(sizeof(*hash) * size, GFP_ATOMIC)) == NULL) { hash = kmalloc(sizeof(*hash) * size, GFP_ATOMIC);
if (hash == NULL) {
printk(KERN_ERR PKNOCK printk(KERN_ERR PKNOCK
"kmalloc() error in alloc_hashtable() function.\n"); "kmalloc() error in alloc_hashtable() function.\n");
return NULL; return NULL;
@@ -399,7 +400,8 @@ add_rule(struct ipt_pknock *info)
} }
} }
if ((rule = kmalloc(sizeof (*rule), GFP_ATOMIC)) == NULL) { rule = kmalloc(sizeof(*rule), GFP_ATOMIC);
if (rule == NULL) {
printk(KERN_ERR PKNOCK "kmalloc() error in add_rule().\n"); printk(KERN_ERR PKNOCK "kmalloc() error in add_rule().\n");
return false; return false;
} }
@@ -412,8 +414,8 @@ add_rule(struct ipt_pknock *info)
rule->ref_count = 1; rule->ref_count = 1;
rule->max_time = info->max_time; rule->max_time = info->max_time;
rule->peer_head = alloc_hashtable(peer_hashsize);
if (!(rule->peer_head = alloc_hashtable(peer_hashsize))) { if (rule->peer_head == NULL) {
printk(KERN_ERR PKNOCK "alloc_hashtable() error in add_rule().\n"); printk(KERN_ERR PKNOCK "alloc_hashtable() error in add_rule().\n");
return false; return false;
} }
@@ -540,9 +542,9 @@ reset_knock_status(struct peer *peer)
static inline struct peer * static inline struct peer *
new_peer(uint32_t ip, uint8_t proto) new_peer(uint32_t ip, uint8_t proto)
{ {
struct peer *peer; struct peer *peer = kmalloc(sizeof(*peer), GFP_ATOMIC);
if ((peer = kmalloc(sizeof (*peer), GFP_ATOMIC)) == NULL) { if (peer == NULL) {
printk(KERN_ERR PKNOCK "kmalloc() error in new_peer().\n"); printk(KERN_ERR PKNOCK "kmalloc() error in new_peer().\n");
return NULL; return NULL;
} }
@@ -921,8 +923,9 @@ static bool pknock_mt(const struct sk_buff *skb,
} }
hdr.port = ntohs(pptr[1]); hdr.port = ntohs(pptr[1]);
hdr.proto = iph->protocol;
switch ((hdr.proto = iph->protocol)) { switch (hdr.proto) {
case IPPROTO_TCP: case IPPROTO_TCP:
break; break;
@@ -944,7 +947,8 @@ static bool pknock_mt(const struct sk_buff *skb,
spin_lock_bh(&list_lock); spin_lock_bh(&list_lock);
/* Searches a rule from the list depending on info structure options. */ /* Searches a rule from the list depending on info structure options. */
if ((rule = search_rule(info)) == NULL) { rule = search_rule(info);
if (rule == NULL) {
printk(KERN_INFO PKNOCK "The rule %s doesn't exist.\n", printk(KERN_INFO PKNOCK "The rule %s doesn't exist.\n",
info->rule_name); info->rule_name);
goto out; goto out;
@@ -1005,7 +1009,8 @@ static bool pknock_mt_check(const struct xt_mtchk_param *par)
/* Singleton. */ /* Singleton. */
if (!rule_hashtable) { if (!rule_hashtable) {
if (!(rule_hashtable = alloc_hashtable(rule_hashsize))) rule_hashtable = alloc_hashtable(rule_hashsize);
if (rule_hashtable == NULL)
RETURN_ERR("alloc_hashtable() error in checkentry()\n"); RETURN_ERR("alloc_hashtable() error in checkentry()\n");
get_random_bytes(&ipt_pknock_hash_rnd, sizeof (ipt_pknock_hash_rnd)); get_random_bytes(&ipt_pknock_hash_rnd, sizeof (ipt_pknock_hash_rnd));
@@ -1116,7 +1121,8 @@ static int __init xt_pknock_mt_init(void)
pr_info("No crypto support for < 2.6.19\n"); pr_info("No crypto support for < 2.6.19\n");
#endif #endif
if (!(pde = proc_mkdir("xt_pknock", init_net__proc_net))) { pde = proc_mkdir("xt_pknock", init_net__proc_net);
if (pde == NULL) {
printk(KERN_ERR PKNOCK "proc_mkdir() error in _init().\n"); printk(KERN_ERR PKNOCK "proc_mkdir() error in _init().\n");
return -ENXIO; return -ENXIO;
} }