Patrick McHardy <kaber@xxxxxxxxx> writes:
>> +int snet_verdict_exit(void)
>> +{
>> + write_lock_bh(&verdict_hash_lock);
>> + if (verdict_hash) {
>> + __snet_verdict_flush();
>> + kfree(verdict_hash);
>> + verdict_hash = NULL;
>> + }
>> + write_unlock_bh(&verdict_hash_lock);
>> +
>> + return 0;
>
> Also the exit() functions should return void, there shouldn't
> be any error conditions since there's no way to handle them.
right. I fixed this with this patch
Patrick, thank you for your time and your comments
sam
commit ca287efd0099b67340dd6c61fbe18fb7fda33872
Author: Samir Bellabes <sam@xxxxxxxxx>
Date: Thu Jan 7 23:09:17 2010 +0100
snet: avoid unnecessary checks by fixing initialisation for verdict and event
checking if snet_evh and snet_vdh are NULL is unnecessary if the initalisations
are sucessfull.
Noticed by Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Samir Bellabes <sam@xxxxxxxxx>
diff --git a/security/snet/snet_core.c b/security/snet/snet_core.c
index 562d986..54fad08 100644
--- a/security/snet/snet_core.c
+++ b/security/snet/snet_core.c
@@ -25,15 +25,6 @@ unsigned int snet_verdict_policy = SNET_VERDICT_GRANT; /* permissive by default
module_param(snet_verdict_policy, uint, 0400);
MODULE_PARM_DESC(snet_verdict_policy, "Set the default verdict");
-void snet_core_exit(void)
-{
- snet_netlink_exit();
- snet_event_exit();
- snet_hooks_exit();
- snet_verdict_exit();
- pr_debug("stopped\n");
-}
-
static __init int snet_init(void)
{
int ret;
@@ -46,20 +37,25 @@ static __init int snet_init(void)
ret = snet_event_init();
if (ret < 0)
- goto exit;
+ goto event_failed;
ret = snet_verdict_init();
if (ret < 0)
- goto exit;
+ goto verdict_failed;
ret = snet_hooks_init();
if (ret < 0)
- goto exit;
+ goto hooks_failed;
pr_debug("started\n");
return 0;
-exit:
- snet_core_exit();
+
+hooks_failed:
+ snet_verdict_exit();
+verdict_failed:
+ snet_event_exit();
+event_failed:
+ pr_debug("stopped\n");
return ret;
}
diff --git a/security/snet/snet_event.c b/security/snet/snet_event.c
index cc3b6a2..44155fb 100644
--- a/security/snet/snet_event.c
+++ b/security/snet/snet_event.c
@@ -25,9 +25,6 @@ static struct snet_event_entry *__snet_event_lookup(const enum snet_syscall sysc
struct list_head *l;
struct snet_event_entry *s;
- if (!snet_evh)
- return NULL;
-
/* computing its hash value */
h = jhash_2words(syscall, protocol, 0) % snet_evh_size;
l = &snet_evh[h];
@@ -52,9 +49,6 @@ int snet_event_fill_info(struct sk_buff *skb, struct netlink_callback *cb)
read_lock_bh(&snet_evh_lock);
- if (!snet_evh)
- goto errout;
-
for (i = 0; i < snet_evh_size; i++) {
if (i < hashs_to_skip)
continue;
@@ -151,11 +145,12 @@ int snet_event_remove(const enum snet_syscall syscall, const u8 protocol)
}
/* flushing all events */
-void __snet_event_flush(void)
+void snet_event_flush(void)
{
struct snet_event_entry *data = NULL;
unsigned int i = 0;
+ write_lock_bh(&snet_evh_lock);
for (i = 0; i < snet_evh_size; i++) {
while (!list_empty(&snet_evh[i])) {
data = list_entry(snet_evh[i].next,
@@ -164,14 +159,6 @@ void __snet_event_flush(void)
kfree(data);
}
}
- return;
-}
-
-void snet_event_flush(void)
-{
- write_lock_bh(&snet_evh_lock);
- if (snet_evh)
- __snet_event_flush();
write_unlock_bh(&snet_evh_lock);
return;
}
@@ -200,13 +187,7 @@ out:
/* exit function */
int snet_event_exit(void)
{
- write_lock_bh(&snet_evh_lock);
- if (snet_evh) {
- __snet_event_flush();
- kfree(snet_evh);
- snet_evh = NULL;
- }
- write_unlock_bh(&snet_evh_lock);
-
+ kfree(snet_evh);
+ snet_evh = NULL;
return 0;
}
diff --git a/security/snet/snet_verdict.c b/security/snet/snet_verdict.c
index 477af3b..d9f17f5 100644
--- a/security/snet/snet_verdict.c
+++ b/security/snet/snet_verdict.c
@@ -30,9 +30,6 @@ static struct snet_verdict_entry *__snet_verdict_lookup(const u32 verdict_id)
struct list_head *l = NULL;
struct snet_verdict_entry *s = NULL;
- if (!snet_vdh)
- return NULL;
-
/* computing its hash value */
h = jhash_1word(verdict_id, 0) % snet_vdh_size;
l = &snet_vdh[h];
@@ -135,24 +132,19 @@ int snet_verdict_insert(void)
h = jhash_1word(data->verdict_id, 0) % snet_vdh_size;
write_lock_bh(&snet_vdh_lock);
- if (snet_vdh) {
- list_add_tail(&data->list, &snet_vdh[h]);
- pr_debug("[%u]=(verdict_id=%u)\n", h, data->verdict_id);
- write_unlock_bh(&snet_vdh_lock);
- } else {
- write_unlock_bh(&snet_vdh_lock);
- kfree(data);
- verdict_id = 0;
- }
+ list_add_tail(&data->list, &snet_vdh[h]);
+ pr_debug("[%u]=(verdict_id=%u)\n", h, data->verdict_id);
+ write_unlock_bh(&snet_vdh_lock);
return verdict_id;
}
-void __snet_verdict_flush(void)
+void snet_verdict_flush(void)
{
struct snet_verdict_entry *data = NULL;
unsigned int i = 0;
+ write_lock_bh(&snet_vdh_lock);
for (i = 0; i < snet_vdh_size; i++) {
while (!list_empty(&snet_vdh[i])) {
data = list_entry(snet_vdh[i].next,
@@ -161,14 +153,6 @@ void __snet_verdict_flush(void)
kfree(data);
}
}
- return;
-}
-
-void snet_verdict_flush(void)
-{
- write_lock_bh(&snet_vdh_lock);
- if (snet_vdh)
- __snet_verdict_flush();
write_unlock_bh(&snet_vdh_lock);
return;
}
@@ -197,13 +181,7 @@ out:
/* exit function */
int snet_verdict_exit(void)
{
- write_lock_bh(&snet_vdh_lock);
- if (snet_vdh) {
- __snet_verdict_flush();
- kfree(snet_vdh);
- snet_vdh = NULL;
- }
- write_unlock_bh(&snet_vdh_lock);
-
+ kfree(snet_vdh);
+ snet_vdh = NULL;
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
